Commit f42bb57c authored by Anish Bhatt's avatar Anish Bhatt Committed by David S. Miller

cxgb4i : Fix -Wunused-function warning

A bunch of ipv6 related code is left on by default. While this causes no
compilation issues, there is no need to have this enabled by default. Guard
with an ipv6 check, which also takes care of a -Wunused-function warning.
Signed-off-by: default avatarAnish Bhatt <anish@chelsio.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1bb60376
...@@ -259,6 +259,7 @@ static void send_act_open_req(struct cxgbi_sock *csk, struct sk_buff *skb, ...@@ -259,6 +259,7 @@ static void send_act_open_req(struct cxgbi_sock *csk, struct sk_buff *skb,
cxgb4_l2t_send(csk->cdev->ports[csk->port_id], skb, csk->l2t); cxgb4_l2t_send(csk->cdev->ports[csk->port_id], skb, csk->l2t);
} }
#if IS_ENABLED(CONFIG_IPV6)
static void send_act_open_req6(struct cxgbi_sock *csk, struct sk_buff *skb, static void send_act_open_req6(struct cxgbi_sock *csk, struct sk_buff *skb,
struct l2t_entry *e) struct l2t_entry *e)
{ {
...@@ -344,6 +345,7 @@ static void send_act_open_req6(struct cxgbi_sock *csk, struct sk_buff *skb, ...@@ -344,6 +345,7 @@ static void send_act_open_req6(struct cxgbi_sock *csk, struct sk_buff *skb,
cxgb4_l2t_send(csk->cdev->ports[csk->port_id], skb, csk->l2t); cxgb4_l2t_send(csk->cdev->ports[csk->port_id], skb, csk->l2t);
} }
#endif
static void send_close_req(struct cxgbi_sock *csk) static void send_close_req(struct cxgbi_sock *csk)
{ {
...@@ -781,9 +783,11 @@ static void csk_act_open_retry_timer(unsigned long data) ...@@ -781,9 +783,11 @@ static void csk_act_open_retry_timer(unsigned long data)
if (csk->csk_family == AF_INET) { if (csk->csk_family == AF_INET) {
send_act_open_func = send_act_open_req; send_act_open_func = send_act_open_req;
skb = alloc_wr(size, 0, GFP_ATOMIC); skb = alloc_wr(size, 0, GFP_ATOMIC);
#if IS_ENABLED(CONFIG_IPV6)
} else { } else {
send_act_open_func = send_act_open_req6; send_act_open_func = send_act_open_req6;
skb = alloc_wr(size6, 0, GFP_ATOMIC); skb = alloc_wr(size6, 0, GFP_ATOMIC);
#endif
} }
if (!skb) if (!skb)
...@@ -1335,8 +1339,10 @@ static int init_act_open(struct cxgbi_sock *csk) ...@@ -1335,8 +1339,10 @@ static int init_act_open(struct cxgbi_sock *csk)
if (csk->csk_family == AF_INET) if (csk->csk_family == AF_INET)
skb = alloc_wr(size, 0, GFP_NOIO); skb = alloc_wr(size, 0, GFP_NOIO);
#if IS_ENABLED(CONFIG_IPV6)
else else
skb = alloc_wr(size6, 0, GFP_NOIO); skb = alloc_wr(size6, 0, GFP_NOIO);
#endif
if (!skb) if (!skb)
goto rel_resource; goto rel_resource;
...@@ -1370,8 +1376,10 @@ static int init_act_open(struct cxgbi_sock *csk) ...@@ -1370,8 +1376,10 @@ static int init_act_open(struct cxgbi_sock *csk)
cxgbi_sock_set_state(csk, CTP_ACTIVE_OPEN); cxgbi_sock_set_state(csk, CTP_ACTIVE_OPEN);
if (csk->csk_family == AF_INET) if (csk->csk_family == AF_INET)
send_act_open_req(csk, skb, csk->l2t); send_act_open_req(csk, skb, csk->l2t);
#if IS_ENABLED(CONFIG_IPV6)
else else
send_act_open_req6(csk, skb, csk->l2t); send_act_open_req6(csk, skb, csk->l2t);
#endif
neigh_release(n); neigh_release(n);
return 0; return 0;
......
...@@ -275,6 +275,7 @@ struct cxgbi_device *cxgbi_device_find_by_netdev_rcu(struct net_device *ndev, ...@@ -275,6 +275,7 @@ struct cxgbi_device *cxgbi_device_find_by_netdev_rcu(struct net_device *ndev,
} }
EXPORT_SYMBOL_GPL(cxgbi_device_find_by_netdev_rcu); EXPORT_SYMBOL_GPL(cxgbi_device_find_by_netdev_rcu);
#if IS_ENABLED(CONFIG_IPV6)
static struct cxgbi_device *cxgbi_device_find_by_mac(struct net_device *ndev, static struct cxgbi_device *cxgbi_device_find_by_mac(struct net_device *ndev,
int *port) int *port)
{ {
...@@ -307,6 +308,7 @@ static struct cxgbi_device *cxgbi_device_find_by_mac(struct net_device *ndev, ...@@ -307,6 +308,7 @@ static struct cxgbi_device *cxgbi_device_find_by_mac(struct net_device *ndev,
ndev, ndev->name); ndev, ndev->name);
return NULL; return NULL;
} }
#endif
void cxgbi_hbas_remove(struct cxgbi_device *cdev) void cxgbi_hbas_remove(struct cxgbi_device *cdev)
{ {
......
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