netdev - Re: [net-next PATCH 1/5] igb: allow tx of pre-formatted vlan tagged packets

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20090320152724.GB7395@ajones-laptop.nbttech.com>
Date:	Fri, 20 Mar 2009 08:27:25 -0700
From:	Arthur Jones <ajones@...erbed.com>
To:	Jeff Kirsher <jeffrey.t.kirsher@...el.com>
CC:	"davem@...emloft.net" <davem@...emloft.net>,
	"netdev@...r.kernel.org" <netdev@...r.kernel.org>,
	"gospo@...hat.com" <gospo@...hat.com>,
	Arthur Jones <Arthur.Jones@...erbed.com>
Subject: Re: [net-next PATCH 1/5] igb: allow tx of pre-formatted vlan
	tagged packets

Hi Jeff, ...

On Fri, Mar 20, 2009 at 03:16:31AM -0700, Jeff Kirsher wrote:
>  [...]
> 
>  drivers/net/igb/igb_main.c |   11 +++++++++++
>  1 files changed, 11 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
> index 7c4481b..c14d569 100644
> --- a/drivers/net/igb/igb_main.c
> +++ b/drivers/net/igb/igb_main.c
> @@ -3008,6 +3008,17 @@ static inline bool igb_tx_csum_adv(struct igb_adapter *adapter,
>  		tu_cmd |= (E1000_TXD_CMD_DEXT | E1000_ADVTXD_DTYP_CTXT);
>  
>  		if (skb->ip_summed == CHECKSUM_PARTIAL) {
> +			__be16 protocol;
> +
> +			if (skb->protocol == cpu_to_be16(ETH_P_8021Q)) {
> +				const struct vlan_ethhdr *vhdr =
> +				          (const struct vlan_ethhdr*)skb->data;
> +
> +				protocol = vhdr->h_vlan_encapsulated_proto;
> +			} else {
> +				protocol = skb->protocol;
> +			}
> +
>  			switch (skb->protocol) {
                                ^^^^^^^^^^^^^
This has the same merge error as the e1000e version,
it should be just protocol here, not skb->protocol...

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