diff options
| author |   Manish Chopra <manish.chopra@qlogic.com> | 2016-03-08 04:09:44 -0500 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-03-10 16:19:15 -0500 |
| commit | 88f09bd5b9875a0fbf2075221590d9c4418cdbbc (patch) | |
| tree | 0dd9be502f4658b511807d7ac7a14c58b7f7cd38 /drivers | |
| parent | Merge branch 'qlcnic-next' (diff) | |
| download | linux-dev-88f09bd5b9875a0fbf2075221590d9c4418cdbbc.tar.xz linux-dev-88f09bd5b9875a0fbf2075221590d9c4418cdbbc.zip | |
qede: Fix net-next "make ARCH=x86_64"
'commit 55482edc25f0606851de42e73618f813f310d009
("qede: Add slowpath/fastpath support and enable hardware GRO")'
introduces below error when compiling net-next with "make ARCH=x86_64"
drivers/built-in.o: In function `qede_rx_int':
qede_main.c:(.text+0x6101a0): undefined reference to `tcp_gro_complete'
Signed-off-by: Manish Chopra <manish.chopra@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/net/ethernet/qlogic/qede/qede_main.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c index 572862564ab6..518af329502d 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_main.c +++ b/drivers/net/ethernet/qlogic/qede/qede_main.c @@ -1001,6 +1001,7 @@ static void qede_tpa_start(struct qede_dev *edev, } } +#ifdef CONFIG_INET static void qede_gro_ip_csum(struct sk_buff *skb) { const struct iphdr *iph = ip_hdr(skb); @@ -1029,12 +1030,14 @@ static void qede_gro_ipv6_csum(struct sk_buff *skb) &iph->saddr, &iph->daddr, 0); tcp_gro_complete(skb); } +#endif static void qede_gro_receive(struct qede_dev *edev, struct qede_fastpath *fp, struct sk_buff *skb, u16 vlan_tag) { +#ifdef CONFIG_INET if (skb_shinfo(skb)->gso_size) { switch (skb->protocol) { case htons(ETH_P_IP): @@ -1049,7 +1052,7 @@ static void qede_gro_receive(struct qede_dev *edev, ntohs(skb->protocol)); } } - +#endif skb_record_rx_queue(skb, fp->rss_id); qede_skb_receive(edev, fp, skb, vlan_tag); } |