diff options
Diffstat (limited to 'net/ethernet')
-rw-r--r-- | net/ethernet/eth.c | 3 | ||||
-rw-r--r-- | net/ethernet/sysctl_net_ether.c | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/net/ethernet/eth.c b/net/ethernet/eth.c index f6dbfb99b14d..87a052a9a84f 100644 --- a/net/ethernet/eth.c +++ b/net/ethernet/eth.c | |||
@@ -62,8 +62,6 @@ | |||
62 | #include <asm/system.h> | 62 | #include <asm/system.h> |
63 | #include <asm/checksum.h> | 63 | #include <asm/checksum.h> |
64 | 64 | ||
65 | extern int __init netdev_boot_setup(char *str); | ||
66 | |||
67 | __setup("ether=", netdev_boot_setup); | 65 | __setup("ether=", netdev_boot_setup); |
68 | 66 | ||
69 | /* | 67 | /* |
@@ -163,7 +161,6 @@ __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev) | |||
163 | skb->mac.raw=skb->data; | 161 | skb->mac.raw=skb->data; |
164 | skb_pull(skb,ETH_HLEN); | 162 | skb_pull(skb,ETH_HLEN); |
165 | eth = eth_hdr(skb); | 163 | eth = eth_hdr(skb); |
166 | skb->input_dev = dev; | ||
167 | 164 | ||
168 | if(*eth->h_dest&1) | 165 | if(*eth->h_dest&1) |
169 | { | 166 | { |
diff --git a/net/ethernet/sysctl_net_ether.c b/net/ethernet/sysctl_net_ether.c index b81a6d532342..66b39fc342d2 100644 --- a/net/ethernet/sysctl_net_ether.c +++ b/net/ethernet/sysctl_net_ether.c | |||
@@ -7,6 +7,7 @@ | |||
7 | 7 | ||
8 | #include <linux/mm.h> | 8 | #include <linux/mm.h> |
9 | #include <linux/sysctl.h> | 9 | #include <linux/sysctl.h> |
10 | #include <linux/if_ether.h> | ||
10 | 11 | ||
11 | ctl_table ether_table[] = { | 12 | ctl_table ether_table[] = { |
12 | {0} | 13 | {0} |