diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-23 17:57:14 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-23 17:57:14 -0400 |
| commit | ab3fc403633c38aef5ef48844f8e5dbfee7c34f8 (patch) | |
| tree | 475459da3d3cc0071c71900cfbcdc389d3d71597 /include/linux/netdevice.h | |
| parent | f10d20c1f192aa90fc935207f22da32462e793ee (diff) | |
| parent | d1faeaeb95a05275cf0c5b51b88f2fa833434625 (diff) | |
Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git/
Diffstat (limited to 'include/linux/netdevice.h')
| -rw-r--r-- | include/linux/netdevice.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index ac11d73be4ce..b25bd02720d3 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
| @@ -503,7 +503,7 @@ static inline void *netdev_priv(struct net_device *dev) | |||
| 503 | #define SET_NETDEV_DEV(net, pdev) ((net)->class_dev.dev = (pdev)) | 503 | #define SET_NETDEV_DEV(net, pdev) ((net)->class_dev.dev = (pdev)) |
| 504 | 504 | ||
| 505 | struct packet_type { | 505 | struct packet_type { |
| 506 | unsigned short type; /* This is really htons(ether_type). */ | 506 | __be16 type; /* This is really htons(ether_type). */ |
| 507 | struct net_device *dev; /* NULL is wildcarded here */ | 507 | struct net_device *dev; /* NULL is wildcarded here */ |
| 508 | int (*func) (struct sk_buff *, struct net_device *, | 508 | int (*func) (struct sk_buff *, struct net_device *, |
| 509 | struct packet_type *); | 509 | struct packet_type *); |