net: macb: Fixed mixed declaration and code warnings

This patch fixes these warnings:
drivers/net/ethernet/cadence/macb.c: In function ‘macb_handle_txtstamp’:
drivers/net/ethernet/cadence/macb.c:683:2: warning: ISO C90 forbids
mixed declarations and code [-Wdeclaration-after-statement]
  struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb);
  ^
drivers/net/ethernet/cadence/macb.c: In function ‘macb_handle_rxtstamp’:
drivers/net/ethernet/cadence/macb.c:866:2: warning: ISO C90 forbids
mixed declarations and code [-Wdeclaration-after-statement]
  struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb);
  ^

Signed-off-by: Michal Simek <michal.simek@xilinx.com>

diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index e772ca4fae4b3afc1f820161e7ab2a2c13fa7c7a..36cf3a51673cc2a2278a58e1fb51870911710563 100644 (file)
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -658,6 +658,7 @@ static inline void macb_handle_txtstamp(struct macb *bp, struct sk_buff *skb,
 {
        u32 ts_s, ts_ns;
        u8 msg_type;
+       struct skb_shared_hwtstamps *shhwtstamps;
 
        skb_copy_from_linear_data_offset(skb, GEM_TX_PTPHDR_OFFSET,
                                         &msg_type, 1);
@@ -680,7 +681,7 @@ static inline void macb_handle_txtstamp(struct macb *bp, struct sk_buff *skb,
                ts_ns = desc->tsl & GEM_TSL_NSEC_MASK;
        }
 
-       struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb);
+       shhwtstamps = skb_hwtstamps(skb);
 
        memset(shhwtstamps, 0, sizeof(struct skb_shared_hwtstamps));
        shhwtstamps->hwtstamp = ns_to_ktime((ts_s * NS_PER_SEC) + ts_ns);
@@ -841,6 +842,7 @@ static inline void macb_handle_rxtstamp(struct macb *bp, struct sk_buff *skb,
 {
        u8 msg_type;
        u32 ts_ns, ts_s;
+       struct skb_shared_hwtstamps *shhwtstamps;
 
        skb_copy_from_linear_data_offset(skb, GEM_RX_PTPHDR_OFFSET,
                                         &msg_type, 1);
@@ -863,7 +865,7 @@ static inline void macb_handle_rxtstamp(struct macb *bp, struct sk_buff *skb,
                ts_ns = desc->tsl & GEM_TSL_NSEC_MASK;
        }
 
-       struct skb_shared_hwtstamps *shhwtstamps = skb_hwtstamps(skb);
+       shhwtstamps = skb_hwtstamps(skb);
 
        memset(shhwtstamps, 0, sizeof(struct skb_shared_hwtstamps));
        shhwtstamps->hwtstamp = ns_to_ktime((ts_s * NS_PER_SEC) + ts_ns);