diff options
author | Stefan Agner <stefan@agner.ch> | 2014-10-06 16:25:21 +0200 |
---|---|---|
committer | Stefan Agner <stefan@agner.ch> | 2014-10-06 16:25:21 +0200 |
commit | c646b0f4fdad4cc9dabdcbe40b5a893d173e2850 (patch) | |
tree | 246e0d7bc48137f2d176ad126cebd275a60b6833 /drivers/infiniband/ulp/ipoib/ipoib.h | |
parent | 4ce237b369eb9513c090d3c97e0c06c5a33f0cf7 (diff) | |
parent | bfe01a5ba2490f299e1d2d5508cbbbadd897bbe9 (diff) |
Merge tag 'v3.17' into toradex_vf_3.17-next
Linux 3.17
Conflicts:
Documentation/devicetree/bindings/usb/mxs-phy.txt
drivers/usb/phy/phy-mxs-usb.c
Diffstat (limited to 'drivers/infiniband/ulp/ipoib/ipoib.h')
-rw-r--r-- | drivers/infiniband/ulp/ipoib/ipoib.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/infiniband/ulp/ipoib/ipoib.h b/drivers/infiniband/ulp/ipoib/ipoib.h index 3edce617c31b..d7562beb5423 100644 --- a/drivers/infiniband/ulp/ipoib/ipoib.h +++ b/drivers/infiniband/ulp/ipoib/ipoib.h @@ -131,6 +131,12 @@ struct ipoib_cb { u8 hwaddr[INFINIBAND_ALEN]; }; +static inline struct ipoib_cb *ipoib_skb_cb(const struct sk_buff *skb) +{ + BUILD_BUG_ON(sizeof(skb->cb) < sizeof(struct ipoib_cb)); + return (struct ipoib_cb *)skb->cb; +} + /* Used for all multicast joins (broadcast, IPv4 mcast and IPv6 mcast) */ struct ipoib_mcast { struct ib_sa_mcmember_rec mcmember; |