diff options
author | Michał Mirosław <mirq-linux@rere.qmqm.pl> | 2011-01-24 18:32:47 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2011-01-24 18:32:47 -0500 |
commit | 04ed3e741d0f133e02bed7fa5c98edba128f90e7 (patch) | |
tree | 3dde4ca8306e98536faa69bccf0e47a2549c088f /net/core/skbuff.c | |
parent | 57422dc530115e427dff464cc0a32bcd0efb5008 (diff) |
net: change netdev->features to u32
Quoting Ben Hutchings: we presumably won't be defining features that
can only be enabled on 64-bit architectures.
Occurences found by `grep -r` on net/, drivers/net, include/
[ Move features and vlan_features next to each other in
struct netdev, as per Eric Dumazet's suggestion -DaveM ]
Signed-off-by: Michał Mirosław <mirq-linux@rere.qmqm.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/core/skbuff.c')
-rw-r--r-- | net/core/skbuff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index d31bb36ae0dc..436c4c439240 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
@@ -2497,7 +2497,7 @@ EXPORT_SYMBOL_GPL(skb_pull_rcsum); | |||
2497 | * a pointer to the first in a list of new skbs for the segments. | 2497 | * a pointer to the first in a list of new skbs for the segments. |
2498 | * In case of error it returns ERR_PTR(err). | 2498 | * In case of error it returns ERR_PTR(err). |
2499 | */ | 2499 | */ |
2500 | struct sk_buff *skb_segment(struct sk_buff *skb, int features) | 2500 | struct sk_buff *skb_segment(struct sk_buff *skb, u32 features) |
2501 | { | 2501 | { |
2502 | struct sk_buff *segs = NULL; | 2502 | struct sk_buff *segs = NULL; |
2503 | struct sk_buff *tail = NULL; | 2503 | struct sk_buff *tail = NULL; |
@@ -2507,7 +2507,7 @@ struct sk_buff *skb_segment(struct sk_buff *skb, int features) | |||
2507 | unsigned int offset = doffset; | 2507 | unsigned int offset = doffset; |
2508 | unsigned int headroom; | 2508 | unsigned int headroom; |
2509 | unsigned int len; | 2509 | unsigned int len; |
2510 | int sg = features & NETIF_F_SG; | 2510 | int sg = !!(features & NETIF_F_SG); |
2511 | int nfrags = skb_shinfo(skb)->nr_frags; | 2511 | int nfrags = skb_shinfo(skb)->nr_frags; |
2512 | int err = -ENOMEM; | 2512 | int err = -ENOMEM; |
2513 | int i = 0; | 2513 | int i = 0; |