gro: Name the GRO result enumeration type
Subsystems (2)
PATCH 1/4 gro: Name the GRO result enumeration type
This clarifies which return and parameter types are GRO result codes and not RX result codes.
--- include/linux/netdevice.h | 10 ++++++---- net/8021q/vlan_core.c | 5 +++-- net/core/dev.c | 12 +++++++----- 3 files changed, 16 insertions(+), 11 deletions(-)
include/linux/netdevice.h +6 -4
@@ -348,13 +348,14 @@ enum NAPI_STATE_NPSVC, /* Netpoll - don't dequeue from poll_list */ }; -enum { +enum gro_result {GRO_MERGED ,GRO_MERGED_FREE ,GRO_HELD ,GRO_NORMAL ,GRO_DROP , }; +typedef enum gro_result gro_result_t ;extern void __napi_schedule (struct napi_struct *n);
@@ -1467,16 +1468,17 @@ extern int netif_rx_ni(struct sk_buff *skb);#define HAVE_NETIF_RECEIVE_SKB 1extern int netif_receive_skb (struct sk_buff *skb);extern void napi_gro_flush (struct napi_struct *napi); -extern int dev_gro_receive (struct napi_struct *napi, +extern gro_result_t dev_gro_receive (struct napi_struct *napi,struct sk_buff *skb); -extern int napi_skb_finish (int ret,struct sk_buff *skb); +extern int napi_skb_finish (gro_result_t ret,struct sk_buff *skb);extern int napi_gro_receive (struct napi_struct *napi,struct sk_buff *skb);extern void napi_reuse_skb (struct napi_struct *napi,struct sk_buff *skb);extern struct sk_buff *napi_get_frags (struct napi_struct *napi);extern int napi_frags_finish (struct napi_struct *napi, -struct sk_buff *skb,int ret); +struct sk_buff *skb, +gro_result_t ret);extern struct sk_buff *napi_frags_skb (struct napi_struct *napi);extern int napi_gro_frags (struct napi_struct *napi);
net/8021q/vlan_core.c +3 -2
@@ -74,8 +74,9 @@ u16 vlan_dev_vlan_id(const struct net_device *dev) }EXPORT_SYMBOL (vlan_dev_vlan_id); -static int vlan_gro_common (struct napi_struct *napi,struct vlan_group *grp, -unsigned int vlan_tci,struct sk_buff *skb) +static gro_result_t +vlan_gro_common (struct napi_struct *napi,struct vlan_group *grp, +unsigned int vlan_tci,struct sk_buff *skb) {struct sk_buff *p;
net/core/dev.c +7 -5
@@ -2439,7 +2439,7 @@ void napi_gro_flush(struct napi_struct *napi) }EXPORT_SYMBOL (napi_gro_flush); -int dev_gro_receive (struct napi_struct *napi,struct sk_buff *skb) +enum gro_result dev_gro_receive (struct napi_struct *napi,struct sk_buff *skb) {struct sk_buff **pp =NULL ;struct packet_type *ptype;
@@ -2447,7 +2447,7 @@ int dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb)struct list_head *head = &ptype_base[ntohs (type) &PTYPE_HASH_MASK ];int same_flow;int mac_len; -int ret; +enum gro_result ret;if (!(skb->dev->features &NETIF_F_GRO )) goto normal;
@@ -2531,7 +2531,8 @@ normal: }EXPORT_SYMBOL (dev_gro_receive); -static int __napi_gro_receive (struct napi_struct *napi,struct sk_buff *skb) +static gro_result_t +__napi_gro_receive (struct napi_struct *napi,struct sk_buff *skb) {struct sk_buff *p;
@@ -2548,7 +2549,7 @@ static int __napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb)return dev_gro_receive (napi, skb); } -int napi_skb_finish (int ret,struct sk_buff *skb) +int napi_skb_finish (gro_result_t ret,struct sk_buff *skb) {int err =NET_RX_SUCCESS ;
@@ -2615,7 +2616,8 @@ struct sk_buff *napi_get_frags(struct napi_struct *napi) }EXPORT_SYMBOL (napi_get_frags); -int napi_frags_finish (struct napi_struct *napi,struct sk_buff *skb,int ret) +int napi_frags_finish (struct napi_struct *napi,struct sk_buff *skb, +gro_result_t ret) {int err =NET_RX_SUCCESS ;
Signature · 3 lines
Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.
Quoted 4 lines · Ben Hutchings
This clarifies which return and parameter types are GRO result codes and not RX result codes.
Signed-off-by Ben Hutchings <[email protected]>
Signature · 4 lines
Visit Openswan at http://www.openswan.org/
Email: Herbert Xu ~{PmV>HI~} <[email protected]>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txtFrom: Herbert Xu <[email protected]>
Date: Thu, 29 Oct 2009 13:48:11 -0400
Quoted 7 lines · Ben Hutchings
Quoted 4 lines
This clarifies which return and parameter types are GRO result codes and not RX result codes.
Signed-off-by Ben Hutchings <[email protected]>Acked-by Herbert Xu <[email protected]>
Applied.
Quoted 4 lines · Ben Hutchings
This clarifies which return and parameter types are GRO result codes and not RX result codes.
Signed-off-by Ben Hutchings <[email protected]>
Sorry, this adds some warnings about unhandled enumeration values in a couple of switch statements. I built this with C=2 and mistook the gcc warnings for sparse warnings, which I chose to ignore since the unhandled values are clearly harmless.
I suppose I should add an explicit 'default:' to the switches at the same time.
Ben.
Signature · 3 lines
Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.
PATCH v2 1/1 gro: Name the GRO result enumeration type
This clarifies which return and parameter types are GRO result codes and not RX result codes.
---
This replaces the previous patch 1/4 and avoids introducing compiler warnings. The original patches 2-4 will still apply on top of it.
Ben.
include/linux/netdevice.h | 10 ++++++---- net/8021q/vlan_core.c | 5 +++-- net/core/dev.c | 19 ++++++++++++++----- 3 files changed, 23 insertions(+), 11 deletions(-)
include/linux/netdevice.h +6 -4
@@ -348,13 +348,14 @@ enum NAPI_STATE_NPSVC, /* Netpoll - don't dequeue from poll_list */ }; -enum { +enum gro_result {GRO_MERGED ,GRO_MERGED_FREE ,GRO_HELD ,GRO_NORMAL ,GRO_DROP , }; +typedef enum gro_result gro_result_t ;extern void __napi_schedule (struct napi_struct *n);
@@ -1467,16 +1468,17 @@ extern int netif_rx_ni(struct sk_buff *skb);#define HAVE_NETIF_RECEIVE_SKB 1extern int netif_receive_skb (struct sk_buff *skb);extern void napi_gro_flush (struct napi_struct *napi); -extern int dev_gro_receive (struct napi_struct *napi, +extern gro_result_t dev_gro_receive (struct napi_struct *napi,struct sk_buff *skb); -extern int napi_skb_finish (int ret,struct sk_buff *skb); +extern int napi_skb_finish (gro_result_t ret,struct sk_buff *skb);extern int napi_gro_receive (struct napi_struct *napi,struct sk_buff *skb);extern void napi_reuse_skb (struct napi_struct *napi,struct sk_buff *skb);extern struct sk_buff *napi_get_frags (struct napi_struct *napi);extern int napi_frags_finish (struct napi_struct *napi, -struct sk_buff *skb,int ret); +struct sk_buff *skb, +gro_result_t ret);extern struct sk_buff *napi_frags_skb (struct napi_struct *napi);extern int napi_gro_frags (struct napi_struct *napi);
net/8021q/vlan_core.c +3 -2
@@ -74,8 +74,9 @@ u16 vlan_dev_vlan_id(const struct net_device *dev) }EXPORT_SYMBOL (vlan_dev_vlan_id); -static int vlan_gro_common (struct napi_struct *napi,struct vlan_group *grp, -unsigned int vlan_tci,struct sk_buff *skb) +static gro_result_t +vlan_gro_common (struct napi_struct *napi,struct vlan_group *grp, +unsigned int vlan_tci,struct sk_buff *skb) {struct sk_buff *p;
net/core/dev.c +14 -5
@@ -2439,7 +2439,7 @@ void napi_gro_flush(struct napi_struct *napi) }EXPORT_SYMBOL (napi_gro_flush); -int dev_gro_receive (struct napi_struct *napi,struct sk_buff *skb) +enum gro_result dev_gro_receive (struct napi_struct *napi,struct sk_buff *skb) {struct sk_buff **pp =NULL ;struct packet_type *ptype;
@@ -2447,7 +2447,7 @@ int dev_gro_receive(struct napi_struct *napi, struct sk_buff *skb)struct list_head *head = &ptype_base[ntohs (type) &PTYPE_HASH_MASK ];int same_flow;int mac_len; -int ret; +enum gro_result ret;if (!(skb->dev->features &NETIF_F_GRO )) goto normal;
@@ -2531,7 +2531,8 @@ normal: }EXPORT_SYMBOL (dev_gro_receive); -static int __napi_gro_receive (struct napi_struct *napi,struct sk_buff *skb) +static gro_result_t +__napi_gro_receive (struct napi_struct *napi,struct sk_buff *skb) {struct sk_buff *p;
@@ -2548,7 +2549,7 @@ static int __napi_gro_receive(struct napi_struct *napi, struct sk_buff *skb)return dev_gro_receive (napi, skb); } -int napi_skb_finish (int ret,struct sk_buff *skb) +int napi_skb_finish (gro_result_t ret,struct sk_buff *skb) {int err =NET_RX_SUCCESS ;
@@ -2563,6 +2564,10 @@ int napi_skb_finish(int ret, struct sk_buff *skb)case GRO_MERGED_FREE :kfree_skb (skb);break ; + +case GRO_HELD : +case GRO_MERGED : +break ; }return err;
@@ -2615,7 +2620,8 @@ struct sk_buff *napi_get_frags(struct napi_struct *napi) }EXPORT_SYMBOL (napi_get_frags); -int napi_frags_finish (struct napi_struct *napi,struct sk_buff *skb,int ret) +int napi_frags_finish (struct napi_struct *napi,struct sk_buff *skb, +gro_result_t ret) {int err =NET_RX_SUCCESS ;
@@ -2637,6 +2643,9 @@ int napi_frags_finish(struct napi_struct *napi, struct sk_buff *skb, int ret)case GRO_MERGED_FREE :napi_reuse_skb (napi, skb);break ; + +case GRO_MERGED : +break ; }return err;
Signature · 3 lines
Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.
David Miller
maintainerFrom: Ben Hutchings <[email protected]>
Date: Thu, 29 Oct 2009 18:26:15 +0000
Quoted 7 lines
This clarifies which return and parameter types are GRO result codes and not RX result codes.
Signed-off-by Ben Hutchings <[email protected]>---
This replaces the previous patch 1/4 and avoids introducing compiler warnings. The original patches 2-4 will still apply on top of it.
You can't do this Ben.
Changing this patch makes the follow-on patches not apply cleanly.
So if you respin stuff like this, you have to respin the follow-on patches too.
I'll fix this up, but I am so irritated that I've wasted so much time tonight already on patch submissions that were not handled with any care at all. And it's all at my expense.
Quoted 6 lines · David Miller
From: Ben Hutchings <[email protected]>
Date: Thu, 29 Oct 2009 18:26:15 +0000Quoted 3 lines
This clarifies which return and parameter types are GRO result codes and not RX result codes.
Quoted 8 lines
Quoted 4 lines
Signed-off-by Ben Hutchings <[email protected]>---
This replaces the previous patch 1/4 and avoids introducing compiler warnings. The original patches 2-4 will still apply on top of it.You can't do this Ben.
Changing this patch makes the follow-on patches not apply cleanly.
[...]
I'm sorry about that - a git rebase succeeded without manual attention, so I believed they did.
Ben.
Signature · 3 lines
Ben Hutchings, Senior Software Engineer, Solarflare Communications Not speaking for my employer; that's the marketing department's job. They asked us to note that Solarflare product names are trademarked.