diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-27 22:07:40 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-27 22:07:40 -0400 |
| commit | ff0e0ea2f5d36fa90fc2c57fd019102b0a0cfabf (patch) | |
| tree | 963cdd52a4032cd4827896c4e813cfbf6dd7b3e6 /include/linux/netdevice.h | |
| parent | 43f66a6ce8da299344cf1bc2ac2311889cc88555 (diff) | |
| parent | 1f15d694522af9cd7492695f11dd2dc77b6cf098 (diff) | |
Automatic merge of /spare/repo/netdev-2.6 branch we18
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 *); |