diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-01 18:02:27 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-01 18:02:27 -0400 |
| commit | ceeec3dc375e3b0618f16b34efc56fe093918f8b (patch) | |
| tree | 2293d02721ee05131aaf1c60e4fba7e281585eec /net/ethernet/eth.c | |
| parent | fbff868db3a4cc6a89d51da9a6d49b26c29d04fb (diff) | |
| parent | e3ee3b78f83688a0ae4315e8be71b2eac559904a (diff) | |
/spare/repo/netdev-2.6 branch 'ieee80211'
Diffstat (limited to 'net/ethernet/eth.c')
| -rw-r--r-- | net/ethernet/eth.c | 3 |
1 files changed, 0 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 | { |