aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/pppoe.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/net/pppoe.c')
-rw-r--r--drivers/net/pppoe.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c
index 0d101a18026a..5666ed998142 100644
--- a/drivers/net/pppoe.c
+++ b/drivers/net/pppoe.c
@@ -386,13 +386,13 @@ static int pppoe_rcv(struct sk_buff *skb,
386 if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr))) 386 if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr)))
387 goto drop; 387 goto drop;
388 388
389 if (!(skb = skb_share_check(skb, GFP_ATOMIC))) 389 if (!(skb = skb_share_check(skb, GFP_ATOMIC)))
390 goto out; 390 goto out;
391 391
392 ph = (struct pppoe_hdr *) skb->nh.raw; 392 ph = (struct pppoe_hdr *) skb->nh.raw;
393 393
394 po = get_item((unsigned long) ph->sid, eth_hdr(skb)->h_source); 394 po = get_item((unsigned long) ph->sid, eth_hdr(skb)->h_source);
395 if (po != NULL) 395 if (po != NULL)
396 return sk_receive_skb(sk_pppox(po), skb); 396 return sk_receive_skb(sk_pppox(po), skb);
397drop: 397drop:
398 kfree_skb(skb); 398 kfree_skb(skb);
@@ -418,7 +418,7 @@ static int pppoe_disc_rcv(struct sk_buff *skb,
418 if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr))) 418 if (!pskb_may_pull(skb, sizeof(struct pppoe_hdr)))
419 goto abort; 419 goto abort;
420 420
421 if (!(skb = skb_share_check(skb, GFP_ATOMIC))) 421 if (!(skb = skb_share_check(skb, GFP_ATOMIC)))
422 goto out; 422 goto out;
423 423
424 ph = (struct pppoe_hdr *) skb->nh.raw; 424 ph = (struct pppoe_hdr *) skb->nh.raw;
@@ -745,7 +745,7 @@ static int pppoe_ioctl(struct socket *sock, unsigned int cmd,
745} 745}
746 746
747 747
748static int pppoe_sendmsg(struct kiocb *iocb, struct socket *sock, 748static int pppoe_sendmsg(struct kiocb *iocb, struct socket *sock,
749 struct msghdr *m, size_t total_len) 749 struct msghdr *m, size_t total_len)
750{ 750{
751 struct sk_buff *skb = NULL; 751 struct sk_buff *skb = NULL;
@@ -907,8 +907,8 @@ static int pppoe_xmit(struct ppp_channel *chan, struct sk_buff *skb)
907} 907}
908 908
909 909
910static struct ppp_channel_ops pppoe_chan_ops = { 910static struct ppp_channel_ops pppoe_chan_ops = {
911 .start_xmit = pppoe_xmit, 911 .start_xmit = pppoe_xmit,
912}; 912};
913 913
914static int pppoe_recvmsg(struct kiocb *iocb, struct socket *sock, 914static int pppoe_recvmsg(struct kiocb *iocb, struct socket *sock,
@@ -1010,7 +1010,7 @@ static void *pppoe_seq_next(struct seq_file *seq, void *v, loff_t *pos)
1010 goto out; 1010 goto out;
1011 } 1011 }
1012 po = v; 1012 po = v;
1013 if (po->next) 1013 if (po->next)
1014 po = po->next; 1014 po = po->next;
1015 else { 1015 else {
1016 int hash = hash_item(po->pppoe_pa.sid, po->pppoe_pa.remote); 1016 int hash = hash_item(po->pppoe_pa.sid, po->pppoe_pa.remote);
@@ -1106,7 +1106,7 @@ static int __init pppoe_init(void)
1106 err = pppoe_proc_init(); 1106 err = pppoe_proc_init();
1107 if (err) 1107 if (err)
1108 goto out_unregister_pppox_proto; 1108 goto out_unregister_pppox_proto;
1109 1109
1110 dev_add_pack(&pppoes_ptype); 1110 dev_add_pack(&pppoes_ptype);
1111 dev_add_pack(&pppoed_ptype); 1111 dev_add_pack(&pppoed_ptype);
1112 register_netdevice_notifier(&pppoe_notifier); 1112 register_netdevice_notifier(&pppoe_notifier);