netdev.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: David Miller <davem@davemloft.net>
To: ajit.khaparde@emulex.com
Cc: netdev@vger.kernel.org
Subject: Re: [PATCH net-next 4/5] be2net: pass domain id to be_cmd_link_status_query
Date: Mon, 18 Apr 2011 22:56:59 -0700 (PDT)	[thread overview]
Message-ID: <20110418.225659.112612060.davem@davemloft.net> (raw)
In-Reply-To: <20110418223033.GA9515@akhaparde-VBox>

From: Ajit Khaparde <ajit.khaparde@emulex.com>
Date: Mon, 18 Apr 2011 17:30:33 -0500

> 
> Signed-off-by: Ajit Khaparde <ajit.khaparde@emulex.com>

That's not all this patch does:

> @@ -293,7 +293,6 @@ struct be_adapter {
>  	u8 eq_next_idx;
>  	struct be_drv_stats drv_stats;
>  
> -	struct vlan_group *vlan_grp;
>  	u16 vlans_added;
>  	u16 max_vlans;	/* Number of vlans supported */
>  	u8 vlan_tag[VLAN_N_VID];
...
> @@ -1012,15 +1004,10 @@ static void be_rx_compl_process(struct be_adapter *adapter,
>  		skb->rxhash = rxcp->rss_hash;
>  
>  
> -	if (unlikely(rxcp->vlanf)) {
> -		if (!adapter->vlan_grp || adapter->vlans_added == 0) {
> -			kfree_skb(skb);
> -			return;
> -		}
> -		vlan_hwaccel_receive_skb(skb, adapter->vlan_grp, rxcp->vid);
> -	} else {
> -		netif_receive_skb(skb);
> -	}
> +	if (unlikely(rxcp->vlanf))
> +		__vlan_hwaccel_put_tag(skb, rxcp->vid);
> +
> +	netif_receive_skb(skb);
>  }
>  
>  /* Process the RX completion indicated by rxcp when GRO is enabled */

It seems to be also converting the driver over to the new VLAN
interfaces.

Please seperate this part into a seperate patch and resubmit your
patch series.

Thanks.

  reply	other threads:[~2011-04-19  5:57 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-04-18 22:30 [PATCH net-next 4/5] be2net: pass domain id to be_cmd_link_status_query Ajit Khaparde
2011-04-19  5:56 ` David Miller [this message]
2011-04-19 14:23   ` Ajit.Khaparde
  -- strict thread matches above, loose matches on Subject: below --
2011-04-19 22:11 Ajit Khaparde

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110418.225659.112612060.davem@davemloft.net \
    --to=davem@davemloft.net \
    --cc=ajit.khaparde@emulex.com \
    --cc=netdev@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).