diff options
| author | David S. Miller <davem@davemloft.net> | 2014-09-23 18:09:27 +0200 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2014-09-23 18:09:27 +0200 |
| commit | 1f6d80358dc9bbbeb56cb43384fa11fd645d9289 (patch) | |
| tree | 152bfa5165292a8e4f06d536b6d222a68480e573 /drivers/infiniband/ulp/ipoib/ipoib.h | |
| parent | net: sched: fix compile warning in cls_u32 (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| download | linux-1f6d80358dc9bbbeb56cb43384fa11fd645d9289.tar.xz linux-1f6d80358dc9bbbeb56cb43384fa11fd645d9289.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
arch/mips/net/bpf_jit.c
drivers/net/can/flexcan.c
Both the flexcan and MIPS bpf_jit conflicts were cases of simple
overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
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; |