aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/igb/igb_main.c
diff options
context:
space:
mode:
authorNick Nunley <nicholasx.d.nunley@intel.com>2010-02-16 20:04:56 -0500
committerDavid S. Miller <davem@davemloft.net>2010-02-17 16:21:37 -0500
commit91d4ee3382e78bd78e0251a56e2fa96b20c26e30 (patch)
tree373328946ac046e66eed37af090f2810de2a5d6b /drivers/net/igb/igb_main.c
parent40e90c26f573fa5082be6e046b346e19ab0cd25f (diff)
igb: minor type cleanups
This change cleans up some instances where unsigned int and u32 were being used interchangeably, and cleans up hdr_len which was being set to 0 twice. Signed-off-by: Nicholas Nunley <nicholasx.d.nunley@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/igb/igb_main.c')
-rw-r--r--drivers/net/igb/igb_main.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/drivers/net/igb/igb_main.c b/drivers/net/igb/igb_main.c
index 91c123f9df92..ff392e999ffc 100644
--- a/drivers/net/igb/igb_main.c
+++ b/drivers/net/igb/igb_main.c
@@ -3434,8 +3434,8 @@ static inline int igb_tso_adv(struct igb_ring *tx_ring,
3434 int err; 3434 int err;
3435 struct igb_buffer *buffer_info; 3435 struct igb_buffer *buffer_info;
3436 u32 info = 0, tu_cmd = 0; 3436 u32 info = 0, tu_cmd = 0;
3437 u32 mss_l4len_idx, l4len; 3437 u32 mss_l4len_idx;
3438 *hdr_len = 0; 3438 u8 l4len;
3439 3439
3440 if (skb_header_cloned(skb)) { 3440 if (skb_header_cloned(skb)) {
3441 err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC); 3441 err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
@@ -3671,7 +3671,7 @@ dma_error:
3671} 3671}
3672 3672
3673static inline void igb_tx_queue_adv(struct igb_ring *tx_ring, 3673static inline void igb_tx_queue_adv(struct igb_ring *tx_ring,
3674 int tx_flags, int count, u32 paylen, 3674 u32 tx_flags, int count, u32 paylen,
3675 u8 hdr_len) 3675 u8 hdr_len)
3676{ 3676{
3677 union e1000_adv_tx_desc *tx_desc; 3677 union e1000_adv_tx_desc *tx_desc;
@@ -3770,10 +3770,10 @@ netdev_tx_t igb_xmit_frame_ring_adv(struct sk_buff *skb,
3770 struct igb_ring *tx_ring) 3770 struct igb_ring *tx_ring)
3771{ 3771{
3772 struct igb_adapter *adapter = netdev_priv(tx_ring->netdev); 3772 struct igb_adapter *adapter = netdev_priv(tx_ring->netdev);
3773 unsigned int first;
3774 unsigned int tx_flags = 0;
3775 u8 hdr_len = 0;
3776 int tso = 0, count; 3773 int tso = 0, count;
3774 u32 tx_flags = 0;
3775 u16 first;
3776 u8 hdr_len = 0;
3777 union skb_shared_tx *shtx = skb_tx(skb); 3777 union skb_shared_tx *shtx = skb_tx(skb);
3778 3778
3779 /* need: 1 descriptor per page, 3779 /* need: 1 descriptor per page,