aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorBruce Allan <bruce.w.allan@intel.com>2012-08-17 02:18:13 -0400
committerJeff Kirsher <jeffrey.t.kirsher@intel.com>2012-08-30 22:13:00 -0400
commit70443ae9d07f1c1de2431327814b2594b86a99bb (patch)
tree876e52c23b88300c08f8cb0949fe192e1256d4af /drivers
parent419e551caa9e9689aa2f68a8897f9eaf44958eb3 (diff)
e1000e: cleanup - remove unnecessary variable
Signed-off-by: Bruce Allan <bruce.w.allan@intel.com> Tested-by: Aaron Brown <aaron.f.brown@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/intel/e1000e/netdev.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index c35d354f53a0..c0815ce26af6 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -4669,7 +4669,7 @@ static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb)
4669 struct e1000_buffer *buffer_info; 4669 struct e1000_buffer *buffer_info;
4670 unsigned int i; 4670 unsigned int i;
4671 u32 cmd_length = 0; 4671 u32 cmd_length = 0;
4672 u16 ipcse = 0, tucse, mss; 4672 u16 ipcse = 0, mss;
4673 u8 ipcss, ipcso, tucss, tucso, hdr_len; 4673 u8 ipcss, ipcso, tucss, tucso, hdr_len;
4674 4674
4675 if (!skb_is_gso(skb)) 4675 if (!skb_is_gso(skb))
@@ -4703,7 +4703,6 @@ static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb)
4703 ipcso = (void *)&(ip_hdr(skb)->check) - (void *)skb->data; 4703 ipcso = (void *)&(ip_hdr(skb)->check) - (void *)skb->data;
4704 tucss = skb_transport_offset(skb); 4704 tucss = skb_transport_offset(skb);
4705 tucso = (void *)&(tcp_hdr(skb)->check) - (void *)skb->data; 4705 tucso = (void *)&(tcp_hdr(skb)->check) - (void *)skb->data;
4706 tucse = 0;
4707 4706
4708 cmd_length |= (E1000_TXD_CMD_DEXT | E1000_TXD_CMD_TSE | 4707 cmd_length |= (E1000_TXD_CMD_DEXT | E1000_TXD_CMD_TSE |
4709 E1000_TXD_CMD_TCP | (skb->len - (hdr_len))); 4708 E1000_TXD_CMD_TCP | (skb->len - (hdr_len)));
@@ -4717,7 +4716,7 @@ static int e1000_tso(struct e1000_ring *tx_ring, struct sk_buff *skb)
4717 context_desc->lower_setup.ip_fields.ipcse = cpu_to_le16(ipcse); 4716 context_desc->lower_setup.ip_fields.ipcse = cpu_to_le16(ipcse);
4718 context_desc->upper_setup.tcp_fields.tucss = tucss; 4717 context_desc->upper_setup.tcp_fields.tucss = tucss;
4719 context_desc->upper_setup.tcp_fields.tucso = tucso; 4718 context_desc->upper_setup.tcp_fields.tucso = tucso;
4720 context_desc->upper_setup.tcp_fields.tucse = cpu_to_le16(tucse); 4719 context_desc->upper_setup.tcp_fields.tucse = 0;
4721 context_desc->tcp_seg_setup.fields.mss = cpu_to_le16(mss); 4720 context_desc->tcp_seg_setup.fields.mss = cpu_to_le16(mss);
4722 context_desc->tcp_seg_setup.fields.hdr_len = hdr_len; 4721 context_desc->tcp_seg_setup.fields.hdr_len = hdr_len;
4723 context_desc->cmd_and_length = cpu_to_le32(cmd_length); 4722 context_desc->cmd_and_length = cpu_to_le32(cmd_length);