lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge upstream 2.6.13-rc3 into ieee80211 branch of netdev-2.6.

Browse Source
This commit is contained in:
Jeff Garzik
2005-07-13 16:23:51 -04:00
parent 0c16877570 c32511e271
commit 327309e899
1484 changed files with 74956 additions and 52600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/etherdevice.h
View File

@ -33,7 +33,7 @@ extern int eth_header(struct sk_buff *skb, struct net_device *dev,
unsigned short type, void *daddr,
void *saddr, unsigned len);
extern int eth_rebuild_header(struct sk_buff *skb);
extern unsigned short eth_type_trans(struct sk_buff *skb, struct net_device *dev);
extern __be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev);
extern void eth_header_cache_update(struct hh_cache *hh, struct net_device *dev,
unsigned char * haddr);
extern int eth_header_cache(struct neighbour *neigh,