bnxt_en: Fix compile warnings when CONFIG_INET is not set.

bnxt_gro_skb() has unused variables when CONFIG_INET is not set.  We
really cannot support hardware GRO if CONFIG_INET is not set, so
compile out bnxt_gro_skb() completely and define BNXT_FLAG_GRO to be 0
if CONFIG_INET is not set.  This will effectively always disable
hardware GRO if CONFIG_INET is not set.

Signed-off-by: Michael Chan <mchan@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index 9e36f83..6c2e0c6 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -852,6 +852,7 @@ static inline struct sk_buff *bnxt_gro_skb(struct bnxt_tpa_info *tpa_info,
                                           struct rx_tpa_end_cmp_ext *tpa_end1,
                                           struct sk_buff *skb)
 {
                                           struct rx_tpa_end_cmp_ext *tpa_end1,
                                           struct sk_buff *skb)
 {

+#ifdef CONFIG_INET

        struct tcphdr *th;
        int payload_off, tcp_opt_len = 0;
        int len, nw_off;
        struct tcphdr *th;
        int payload_off, tcp_opt_len = 0;
        int len, nw_off;


@@ -866,7 +867,6 @@ static inline struct sk_buff *bnxt_gro_skb(struct bnxt_tpa_info *tpa_info,
        if (TPA_END_GRO_TS(tpa_end))
                tcp_opt_len = 12;
 
        if (TPA_END_GRO_TS(tpa_end))
                tcp_opt_len = 12;
 

-#ifdef CONFIG_INET

        if (tpa_info->gso_type == SKB_GSO_TCPV4) {
                struct iphdr *iph;
 
        if (tpa_info->gso_type == SKB_GSO_TCPV4) {
                struct iphdr *iph;
 

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index 5ee3cc2..4f2267c 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -855,7 +855,12 @@ struct bnxt {
        #define BNXT_FLAG_DCB_ENABLED   0x1
        #define BNXT_FLAG_VF            0x2
        #define BNXT_FLAG_LRO           0x4
        #define BNXT_FLAG_DCB_ENABLED   0x1
        #define BNXT_FLAG_VF            0x2
        #define BNXT_FLAG_LRO           0x4

+#ifdef CONFIG_INET

        #define BNXT_FLAG_GRO           0x8
        #define BNXT_FLAG_GRO           0x8

+#else
+       /* Cannot support hardware GRO if CONFIG_INET is not set */
+       #define BNXT_FLAG_GRO           0x0
+#endif

        #define BNXT_FLAG_TPA           (BNXT_FLAG_LRO | BNXT_FLAG_GRO)
        #define BNXT_FLAG_JUMBO         0x10
        #define BNXT_FLAG_STRIP_VLAN    0x20
        #define BNXT_FLAG_TPA           (BNXT_FLAG_LRO | BNXT_FLAG_GRO)
        #define BNXT_FLAG_JUMBO         0x10
        #define BNXT_FLAG_STRIP_VLAN    0x20