diff options
author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2011-11-15 10:29:55 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-11-16 17:43:10 -0500 |
commit | c8f44affb7244f2ac3e703cab13d55ede27621bb (patch) | |
tree | 62e7aea2916a8d7cab825fe500670c5113854c0f /include/linux/skbuff.h | |
parent | a59e2ecb859f2ab03bb2e230709f8039472ad2c3 (diff) |
net: introduce and use netdev_features_t for device features sets
v2: add couple missing conversions in drivers
split unexporting netdev_fix_features()
implemented %pNF
convert sock::sk_route_(no?)caps
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux/skbuff.h')
-rw-r--r-- | include/linux/skbuff.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index abad8a0941e8..a10e487c0864 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <linux/dmaengine.h> | 30 | #include <linux/dmaengine.h> |
31 | #include <linux/hrtimer.h> | 31 | #include <linux/hrtimer.h> |
32 | #include <linux/dma-mapping.h> | 32 | #include <linux/dma-mapping.h> |
33 | #include <linux/netdev_features.h> | ||
33 | 34 | ||
34 | /* Don't change this without changing skb_csum_unnecessary! */ | 35 | /* Don't change this without changing skb_csum_unnecessary! */ |
35 | #define CHECKSUM_NONE 0 | 36 | #define CHECKSUM_NONE 0 |
@@ -2106,7 +2107,8 @@ extern void skb_split(struct sk_buff *skb, | |||
2106 | extern int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, | 2107 | extern int skb_shift(struct sk_buff *tgt, struct sk_buff *skb, |
2107 | int shiftlen); | 2108 | int shiftlen); |
2108 | 2109 | ||
2109 | extern struct sk_buff *skb_segment(struct sk_buff *skb, u32 features); | 2110 | extern struct sk_buff *skb_segment(struct sk_buff *skb, |
2111 | netdev_features_t features); | ||
2110 | 2112 | ||
2111 | static inline void *skb_header_pointer(const struct sk_buff *skb, int offset, | 2113 | static inline void *skb_header_pointer(const struct sk_buff *skb, int offset, |
2112 | int len, void *buffer) | 2114 | int len, void *buffer) |