On 16-03-2009 14:22, Herbert Xu wrote:
...
quoted text
> GRO: Move netpoll checks to correct location
...
quoted text
> +static inline int netpoll_rx_on(struct sk_buff *skb)
> +{
> +	struct netpoll_info *npinfo = skb->dev->npinfo;
> +
> +	return npinfo && (npinfo->rx_np || npinfo->rx_flags);
> +}
> +
>  static inline int netpoll_receive_skb(struct sk_buff *skb)
>  {
>  	if (!list_empty(&skb->dev->napi_list))
> @@ -99,6 +106,10 @@ static inline int netpoll_rx(struct sk_buff *skb)
>  {
>  	return 0;
>  }
> +static inline int netpoll_rx_on(struct sk_buff *skb)
> +{
> +	return 0;
> +}
>  static inline int netpoll_receive_skb(struct sk_buff *skb)
>  {
>  	return 0;
> diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c
> index 2d6e405..6227248 100644
> --- a/net/8021q/vlan_core.c
> +++ b/net/8021q/vlan_core.c
> @@ -79,6 +79,9 @@ static int vlan_gro_common(struct napi_struct *napi, struct vlan_group *grp,
>  {
>  	struct sk_buff *p;
>  
> +	if (netpoll_rx_on(skb))
> +		return GRO_NORMAL;
> +

Probably I miss something, but you seem to assume here this skb will
be taken by netpoll later. But if it's not active (trapped) vlan
packet will be passed as "normal"?

Thanks,
Jarek P.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html