فهرست منبع

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>
Nick Nunley 15 سال پیش
والد
کامیت
91d4ee3382
1فایلهای تغییر یافته به همراه6 افزوده شده و 6 حذف شده
  1. 6 6
      drivers/net/igb/igb_main.c

+ 6 - 6
drivers/net/igb/igb_main.c

@@ -3434,8 +3434,8 @@ static inline int igb_tso_adv(struct igb_ring *tx_ring,
 	int err;
 	int err;
 	struct igb_buffer *buffer_info;
 	struct igb_buffer *buffer_info;
 	u32 info = 0, tu_cmd = 0;
 	u32 info = 0, tu_cmd = 0;
-	u32 mss_l4len_idx, l4len;
-	*hdr_len = 0;
+	u32 mss_l4len_idx;
+	u8 l4len;
 
 
 	if (skb_header_cloned(skb)) {
 	if (skb_header_cloned(skb)) {
 		err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
 		err = pskb_expand_head(skb, 0, 0, GFP_ATOMIC);
@@ -3671,7 +3671,7 @@ dma_error:
 }
 }
 
 
 static inline void igb_tx_queue_adv(struct igb_ring *tx_ring,
 static inline void igb_tx_queue_adv(struct igb_ring *tx_ring,
-				    int tx_flags, int count, u32 paylen,
+				    u32 tx_flags, int count, u32 paylen,
 				    u8 hdr_len)
 				    u8 hdr_len)
 {
 {
 	union e1000_adv_tx_desc *tx_desc;
 	union e1000_adv_tx_desc *tx_desc;
@@ -3770,10 +3770,10 @@ netdev_tx_t igb_xmit_frame_ring_adv(struct sk_buff *skb,
 				    struct igb_ring *tx_ring)
 				    struct igb_ring *tx_ring)
 {
 {
 	struct igb_adapter *adapter = netdev_priv(tx_ring->netdev);
 	struct igb_adapter *adapter = netdev_priv(tx_ring->netdev);
-	unsigned int first;
-	unsigned int tx_flags = 0;
-	u8 hdr_len = 0;
 	int tso = 0, count;
 	int tso = 0, count;
+	u32 tx_flags = 0;
+	u16 first;
+	u8 hdr_len = 0;
 	union skb_shared_tx *shtx = skb_tx(skb);
 	union skb_shared_tx *shtx = skb_tx(skb);
 
 
 	/* need: 1 descriptor per page,
 	/* need: 1 descriptor per page,