Commit d1611c3a authored by Michael Chan's avatar Michael Chan Committed by David S. Miller

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: default avatarMichael Chan <mchan@broadcom.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3ed770f6
...@@ -852,6 +852,7 @@ static inline struct sk_buff *bnxt_gro_skb(struct bnxt_tpa_info *tpa_info, ...@@ -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 rx_tpa_end_cmp_ext *tpa_end1,
struct sk_buff *skb) struct sk_buff *skb)
{ {
#ifdef CONFIG_INET
struct tcphdr *th; struct tcphdr *th;
int payload_off, tcp_opt_len = 0; int payload_off, tcp_opt_len = 0;
int len, nw_off; int len, nw_off;
...@@ -866,7 +867,6 @@ static inline struct sk_buff *bnxt_gro_skb(struct bnxt_tpa_info *tpa_info, ...@@ -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)) if (TPA_END_GRO_TS(tpa_end))
tcp_opt_len = 12; tcp_opt_len = 12;
#ifdef CONFIG_INET
if (tpa_info->gso_type == SKB_GSO_TCPV4) { if (tpa_info->gso_type == SKB_GSO_TCPV4) {
struct iphdr *iph; struct iphdr *iph;
......
...@@ -855,7 +855,12 @@ struct bnxt { ...@@ -855,7 +855,12 @@ struct bnxt {
#define BNXT_FLAG_DCB_ENABLED 0x1 #define BNXT_FLAG_DCB_ENABLED 0x1
#define BNXT_FLAG_VF 0x2 #define BNXT_FLAG_VF 0x2
#define BNXT_FLAG_LRO 0x4 #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_TPA (BNXT_FLAG_LRO | BNXT_FLAG_GRO)
#define BNXT_FLAG_JUMBO 0x10 #define BNXT_FLAG_JUMBO 0x10
#define BNXT_FLAG_STRIP_VLAN 0x20 #define BNXT_FLAG_STRIP_VLAN 0x20
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment