diff options
author | Ben Hutchings <bhutchings@solarflare.com> | 2009-10-29 03:17:09 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-10-30 00:33:55 -0400 |
commit | 5b252f0c2f98df21fadf0f6cf189b87a0b938228 (patch) | |
tree | d3003625d8c5fd6d54466f81cffab1b5459bb98f /include/linux/netdevice.h | |
parent | 0519d83d83ed485b5a1f9222ff69d7d6c9bb8a01 (diff) |
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 'include/linux/netdevice.h')
-rw-r--r-- | include/linux/netdevice.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index ffc3106cc037..6e777efe149e 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h | |||
@@ -348,13 +348,14 @@ enum | |||
348 | NAPI_STATE_NPSVC, /* Netpoll - don't dequeue from poll_list */ | 348 | NAPI_STATE_NPSVC, /* Netpoll - don't dequeue from poll_list */ |
349 | }; | 349 | }; |
350 | 350 | ||
351 | enum { | 351 | enum gro_result { |
352 | GRO_MERGED, | 352 | GRO_MERGED, |
353 | GRO_MERGED_FREE, | 353 | GRO_MERGED_FREE, |
354 | GRO_HELD, | 354 | GRO_HELD, |
355 | GRO_NORMAL, | 355 | GRO_NORMAL, |
356 | GRO_DROP, | 356 | GRO_DROP, |
357 | }; | 357 | }; |
358 | typedef enum gro_result gro_result_t; | ||
358 | 359 | ||
359 | extern void __napi_schedule(struct napi_struct *n); | 360 | extern void __napi_schedule(struct napi_struct *n); |
360 | 361 | ||
@@ -1480,16 +1481,17 @@ extern int netif_rx_ni(struct sk_buff *skb); | |||
1480 | #define HAVE_NETIF_RECEIVE_SKB 1 | 1481 | #define HAVE_NETIF_RECEIVE_SKB 1 |
1481 | extern int netif_receive_skb(struct sk_buff *skb); | 1482 | extern int netif_receive_skb(struct sk_buff *skb); |
1482 | extern void napi_gro_flush(struct napi_struct *napi); | 1483 | extern void napi_gro_flush(struct napi_struct *napi); |
1483 | extern int dev_gro_receive(struct napi_struct *napi, | 1484 | extern gro_result_t dev_gro_receive(struct napi_struct *napi, |
1484 | struct sk_buff *skb); | 1485 | struct sk_buff *skb); |
1485 | extern int napi_skb_finish(int ret, struct sk_buff *skb); | 1486 | extern int napi_skb_finish(gro_result_t ret, struct sk_buff *skb); |
1486 | extern int napi_gro_receive(struct napi_struct *napi, | 1487 | extern int napi_gro_receive(struct napi_struct *napi, |
1487 | struct sk_buff *skb); | 1488 | struct sk_buff *skb); |
1488 | extern void napi_reuse_skb(struct napi_struct *napi, | 1489 | extern void napi_reuse_skb(struct napi_struct *napi, |
1489 | struct sk_buff *skb); | 1490 | struct sk_buff *skb); |
1490 | extern struct sk_buff * napi_get_frags(struct napi_struct *napi); | 1491 | extern struct sk_buff * napi_get_frags(struct napi_struct *napi); |
1491 | extern int napi_frags_finish(struct napi_struct *napi, | 1492 | extern int napi_frags_finish(struct napi_struct *napi, |
1492 | struct sk_buff *skb, int ret); | 1493 | struct sk_buff *skb, |
1494 | gro_result_t ret); | ||
1493 | extern struct sk_buff * napi_frags_skb(struct napi_struct *napi); | 1495 | extern struct sk_buff * napi_frags_skb(struct napi_struct *napi); |
1494 | extern int napi_gro_frags(struct napi_struct *napi); | 1496 | extern int napi_gro_frags(struct napi_struct *napi); |
1495 | 1497 | ||