diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-01 18:02:01 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-01 18:02:01 -0400 |
| commit | e3ee3b78f83688a0ae4315e8be71b2eac559904a (patch) | |
| tree | deb03bcdd020262af450ed23382d7c921263f5cf /drivers/net/pppoe.c | |
| parent | 91cb70c1769d9b72dd1efe40c31f01005820b09e (diff) | |
| parent | 6b39374a27eb4be7e9d82145ae270ba02ea90dc8 (diff) | |
/spare/repo/netdev-2.6 branch 'master'
Diffstat (limited to 'drivers/net/pppoe.c')
| -rw-r--r-- | drivers/net/pppoe.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/pppoe.c b/drivers/net/pppoe.c index ce1a9bf7b9a7..82f236cc3b9b 100644 --- a/drivers/net/pppoe.c +++ b/drivers/net/pppoe.c | |||
| @@ -377,7 +377,8 @@ abort_kfree: | |||
| 377 | ***********************************************************************/ | 377 | ***********************************************************************/ |
| 378 | static int pppoe_rcv(struct sk_buff *skb, | 378 | static int pppoe_rcv(struct sk_buff *skb, |
| 379 | struct net_device *dev, | 379 | struct net_device *dev, |
| 380 | struct packet_type *pt) | 380 | struct packet_type *pt, |
| 381 | struct net_device *orig_dev) | ||
| 381 | 382 | ||
| 382 | { | 383 | { |
| 383 | struct pppoe_hdr *ph; | 384 | struct pppoe_hdr *ph; |
| @@ -426,7 +427,8 @@ out: | |||
| 426 | ***********************************************************************/ | 427 | ***********************************************************************/ |
| 427 | static int pppoe_disc_rcv(struct sk_buff *skb, | 428 | static int pppoe_disc_rcv(struct sk_buff *skb, |
| 428 | struct net_device *dev, | 429 | struct net_device *dev, |
| 429 | struct packet_type *pt) | 430 | struct packet_type *pt, |
| 431 | struct net_device *orig_dev) | ||
| 430 | 432 | ||
| 431 | { | 433 | { |
| 432 | struct pppoe_hdr *ph; | 434 | struct pppoe_hdr *ph; |