aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnish Bhatt <anish@chelsio.com>2014-07-17 03:18:16 -0400
committerDavid S. Miller <davem@davemloft.net>2014-07-17 19:06:03 -0400
commita3e3b2857d35988819bc396c012c53898b8223e6 (patch)
treea6554561feb69e63a7977f19046416aa47d1dfe3
parent3ded29ace767a626d07c14fbdf9586dc0e520636 (diff)
cxgb4: Export symbols required by cxgb4i for ipv6 support and required defines
Signed-off-by: Anish Bhatt <anish@chelsio.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c10
-rw-r--r--drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h4
-rw-r--r--drivers/net/ethernet/chelsio/cxgb4/t4_msg.h2
3 files changed, 12 insertions, 4 deletions
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
index 9c7e4f0a7683..8b46534b06c1 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c
@@ -3445,8 +3445,8 @@ static int tid_init(struct tid_info *t)
3445 return 0; 3445 return 0;
3446} 3446}
3447 3447
3448static int cxgb4_clip_get(const struct net_device *dev, 3448int cxgb4_clip_get(const struct net_device *dev,
3449 const struct in6_addr *lip) 3449 const struct in6_addr *lip)
3450{ 3450{
3451 struct adapter *adap; 3451 struct adapter *adap;
3452 struct fw_clip_cmd c; 3452 struct fw_clip_cmd c;
@@ -3460,9 +3460,10 @@ static int cxgb4_clip_get(const struct net_device *dev,
3460 c.ip_lo = *(__be64 *)(lip->s6_addr + 8); 3460 c.ip_lo = *(__be64 *)(lip->s6_addr + 8);
3461 return t4_wr_mbox_meat(adap, adap->mbox, &c, sizeof(c), &c, false); 3461 return t4_wr_mbox_meat(adap, adap->mbox, &c, sizeof(c), &c, false);
3462} 3462}
3463EXPORT_SYMBOL(cxgb4_clip_get);
3463 3464
3464static int cxgb4_clip_release(const struct net_device *dev, 3465int cxgb4_clip_release(const struct net_device *dev,
3465 const struct in6_addr *lip) 3466 const struct in6_addr *lip)
3466{ 3467{
3467 struct adapter *adap; 3468 struct adapter *adap;
3468 struct fw_clip_cmd c; 3469 struct fw_clip_cmd c;
@@ -3476,6 +3477,7 @@ static int cxgb4_clip_release(const struct net_device *dev,
3476 c.ip_lo = *(__be64 *)(lip->s6_addr + 8); 3477 c.ip_lo = *(__be64 *)(lip->s6_addr + 8);
3477 return t4_wr_mbox_meat(adap, adap->mbox, &c, sizeof(c), &c, false); 3478 return t4_wr_mbox_meat(adap, adap->mbox, &c, sizeof(c), &c, false);
3478} 3479}
3480EXPORT_SYMBOL(cxgb4_clip_release);
3479 3481
3480/** 3482/**
3481 * cxgb4_create_server - create an IP server 3483 * cxgb4_create_server - create an IP server
diff --git a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h
index 79a84de1d204..1366ba620c87 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.h
@@ -172,6 +172,10 @@ int cxgb4_create_server_filter(const struct net_device *dev, unsigned int stid,
172 unsigned char port, unsigned char mask); 172 unsigned char port, unsigned char mask);
173int cxgb4_remove_server_filter(const struct net_device *dev, unsigned int stid, 173int cxgb4_remove_server_filter(const struct net_device *dev, unsigned int stid,
174 unsigned int queue, bool ipv6); 174 unsigned int queue, bool ipv6);
175int cxgb4_clip_get(const struct net_device *dev, const struct in6_addr *lip);
176int cxgb4_clip_release(const struct net_device *dev,
177 const struct in6_addr *lip);
178
175static inline void set_wr_txq(struct sk_buff *skb, int prio, int queue) 179static inline void set_wr_txq(struct sk_buff *skb, int prio, int queue)
176{ 180{
177 skb_set_queue_mapping(skb, (queue << 1) | prio); 181 skb_set_queue_mapping(skb, (queue << 1) | prio);
diff --git a/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h b/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
index 64006327df83..0259feeab1b3 100644
--- a/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
+++ b/drivers/net/ethernet/chelsio/cxgb4/t4_msg.h
@@ -270,6 +270,8 @@ struct cpl_pass_accept_rpl {
270#define RX_COALESCE_VALID(x) ((x) << 11) 270#define RX_COALESCE_VALID(x) ((x) << 11)
271#define RX_COALESCE(x) ((x) << 12) 271#define RX_COALESCE(x) ((x) << 12)
272#define PACE(x) ((x) << 16) 272#define PACE(x) ((x) << 16)
273#define RX_FC_VALID ((1U) << 19)
274#define RX_FC_DISABLE ((1U) << 20)
273#define TX_QUEUE(x) ((x) << 23) 275#define TX_QUEUE(x) ((x) << 23)
274#define RX_CHANNEL(x) ((x) << 26) 276#define RX_CHANNEL(x) ((x) << 26)
275#define CCTRL_ECN(x) ((x) << 27) 277#define CCTRL_ECN(x) ((x) << 27)