diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-12 12:22:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-08-12 12:22:34 -0400 |
| commit | 63788ea9245688772d13b979bea05bd72b239aad (patch) | |
| tree | 13f00cc8f6da1ed6c583947652bbedb2a0e27693 /include/linux/skbuff.h | |
| parent | 349188f66da2fd88f8cb2407763051d8e136c9aa (diff) | |
| parent | d7b9dfc8ea43936e6e8eec3040dcf4f110563868 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'include/linux/skbuff.h')
| -rw-r--r-- | include/linux/skbuff.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 0061c9470482..948527e42a60 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
| @@ -255,7 +255,7 @@ struct sk_buff { | |||
| 255 | nohdr:1; | 255 | nohdr:1; |
| 256 | /* 3 bits spare */ | 256 | /* 3 bits spare */ |
| 257 | __u8 pkt_type; | 257 | __u8 pkt_type; |
| 258 | __u16 protocol; | 258 | __be16 protocol; |
| 259 | 259 | ||
| 260 | void (*destructor)(struct sk_buff *skb); | 260 | void (*destructor)(struct sk_buff *skb); |
| 261 | #ifdef CONFIG_NETFILTER | 261 | #ifdef CONFIG_NETFILTER |