diff options
| author |   Ben Hutchings <bhutchings@solarflare.com> | 2009-10-29 07:17:09 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2009-10-29 21:33:55 -0700 |
| commit | 5b252f0c2f98df21fadf0f6cf189b87a0b938228 (patch) | |
| tree | d3003625d8c5fd6d54466f81cffab1b5459bb98f /net/8021q | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6 (diff) | |
| download | linux-dev-5b252f0c2f98df21fadf0f6cf189b87a0b938228.tar.xz linux-dev-5b252f0c2f98df21fadf0f6cf189b87a0b938228.zip | |
gro: Name the GRO result enumeration type
This clarifies which return and parameter types are GRO result codes
and not RX result codes.
Signed-off-by: Ben Hutchings <bhutchings@solarflare.com>
Acked-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/8021q')
| -rw-r--r-- | net/8021q/vlan_core.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c index 7f7de1a04de6..47a80d65c3b7 100644 --- a/net/8021q/vlan_core.c +++ b/net/8021q/vlan_core.c @@ -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; |