Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9355ec23 authored by Herbert Xu's avatar Herbert Xu Committed by David S. Miller
Browse files

[PPP] pppoe: Fill in header directly in __pppoe_xmit 



This patch removes the hdr variable (which is copied into the skb)
and instead sets the header directly in the skb.

It also uses __skb_push instead of skb_push since we've just checked
using skb_cow for enough head room.

Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent db7bf6d9

drivers/net/pppoe.c

+9 −11
Original line number Diff line number Diff line
@@ -848,19 +848,12 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb) 
{

	struct pppox_sock *po = pppox_sk(sk);

	struct net_device *dev = po->pppoe_dev;

	struct pppoe_hdr hdr;

	struct pppoe_hdr *ph;

	int data_len = skb->len;



	if (sock_flag(sk, SOCK_DEAD) || !(sk->sk_state & PPPOX_CONNECTED))

		goto abort;



	hdr.ver	= 1;

	hdr.type = 1;

	hdr.code = 0;

	hdr.sid	= po->num;

	hdr.length = htons(skb->len);



	if (!dev)

		goto abort;
@@ -870,12 +863,17 @@ static int __pppoe_xmit(struct sock *sk, struct sk_buff *skb) 
	if (skb_cow(skb, sizeof(*ph) + dev->hard_header_len))

		goto abort;



	ph = (struct pppoe_hdr *) skb_push(skb, sizeof(struct pppoe_hdr));

	memcpy(ph, &hdr, sizeof(struct pppoe_hdr));

	skb->protocol = __constant_htons(ETH_P_PPP_SES);



	__skb_push(skb, sizeof(*ph));

	skb_reset_network_header(skb);



	ph = pppoe_hdr(skb);

	ph->ver	= 1;

	ph->type = 1;

	ph->code = 0;

	ph->sid	= po->num;

	ph->length = htons(data_len);



	skb->protocol = __constant_htons(ETH_P_PPP_SES);

	skb->dev = dev;



	dev->hard_header(skb, dev, ETH_P_PPP_SES,