diff mbox

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

Message ID 20090320101631.17663.63853.stgit@lost.foo-projects.org
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Kirsher, Jeffrey T March 20, 2009, 10:16 a.m. UTC 
From: Arthur Jones <ajones@riverbed.com>

When the 82575 is fed 802.1q packets, it chokes with
an error of the form:

igb 0000:08:00.1 partial checksum but proto=81!

As the logic there was not smart enough to look into
the vlan header to pick out the encapsulated protocol.

There are times when we'd like to send these packets
out without having to configure a vlan on the interface.
Here we check for the vlan tag and allow the packet to
go out with the correct hardware checksum.

Thanks to Kand Ly <kand@riverbed.com> for discovering the
issue and the coming up with a solution.  This patch is
based upon his work.

Signed-off-by: Arthur Jones <ajones@riverbed.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
---

 drivers/net/igb/igb_main.c |   11 +++++++++++
 1 files changed, 11 insertions(+), 0 deletions(-)


--
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

Comments

Arthur Jones March 20, 2009, 3:27 p.m. UTC | #1 
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@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Kirsher, Jeffrey T March 20, 2009, 9:28 p.m. UTC | #2 
On Fri, Mar 20, 2009 at 8:27 AM, Arthur Jones <ajones@riverbed.com> wrote:
> 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
> --

Sorry, when I merged your patch into my tree, that is when the merge
error occurred.
David Miller March 21, 2009, 11:55 p.m. UTC | #3 
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Date: Fri, 20 Mar 2009 03:16:31 -0700

> When the 82575 is fed 802.1q packets, it chokes with
> an error of the form:
> 
> igb 0000:08:00.1 partial checksum but proto=81!
 ...
> Signed-off-by: Arthur Jones <ajones@riverbed.com>
> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
> +
>  			switch (skb->protocol) {
>  			case cpu_to_be16(ETH_P_IP):
>  				tu_cmd |= E1000_ADVTXD_TUCMD_IPV4;

Applied with skb->protocol fixed to be just plain 'protocol'.
--
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
diff mbox

Patch

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) {
 			case cpu_to_be16(ETH_P_IP):
 				tu_cmd |= E1000_ADVTXD_TUCMD_IPV4;