diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-07-13 16:23:51 -0400 |
| commit | 327309e899662b482c58cf25f574513d38b5788c (patch) | |
| tree | 069de438aa0e92dd9b6ba28e6b207e2cd07151a5 /include/linux/etherdevice.h | |
| parent | 0c168775709faa74c1b87f1e61046e0c51ade7f3 (diff) | |
| parent | c32511e2718618f0b53479eb36e07439aa363a74 (diff) | |
Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.
Diffstat (limited to 'include/linux/etherdevice.h')
| -rw-r--r-- | include/linux/etherdevice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/etherdevice.h b/include/linux/etherdevice.h index a6626dac6e3f..4522c7186bf3 100644 --- a/include/linux/etherdevice.h +++ b/include/linux/etherdevice.h | |||
| @@ -33,7 +33,7 @@ extern int eth_header(struct sk_buff *skb, struct net_device *dev, | |||
| 33 | unsigned short type, void *daddr, | 33 | unsigned short type, void *daddr, |
| 34 | void *saddr, unsigned len); | 34 | void *saddr, unsigned len); |
| 35 | extern int eth_rebuild_header(struct sk_buff *skb); | 35 | extern int eth_rebuild_header(struct sk_buff *skb); |
| 36 | extern unsigned short eth_type_trans(struct sk_buff *skb, struct net_device *dev); | 36 | extern __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev); |
| 37 | extern void eth_header_cache_update(struct hh_cache *hh, struct net_device *dev, | 37 | extern void eth_header_cache_update(struct hh_cache *hh, struct net_device *dev, |
| 38 | unsigned char * haddr); | 38 | unsigned char * haddr); |
| 39 | extern int eth_header_cache(struct neighbour *neigh, | 39 | extern int eth_header_cache(struct neighbour *neigh, |