diff options
| author | David S. Miller <davem@davemloft.net> | 2017-06-16 18:48:41 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-06-16 18:48:41 +0300 |
| commit | 3dc02251f43fb5ec7fa576138005edbfe35ed1ca (patch) | |
| tree | 41e0cfc0c640666a75ad07588df34addb18176d0 /net/psample | |
| parent | 61f73d1ea4c68544b959228ead7ef5c021791b14 (diff) | |
| parent | 634fef61076d644b989b86abc2f560d81a089a31 (diff) | |
| download | linux-3dc02251f43fb5ec7fa576138005edbfe35ed1ca.tar.xz | |
Merge branch 'skb-accessor-cleanups'
Johannes Berg says:
====================
skb data accessors cleanup
Over night, Fengguang's bot told me that it compiled all of its many
various configurations successfully, and I had done allyesconfig on
x86_64 myself yesterday to iron out the things I missed.
So now I think I'm happy with it.
My tree was based on your
commit 3715c47bcda8bb56f7e2be27276282a2d0d48c09
Merge: 18b6e7955d8f d8fbd27469fc
Author: David S. Miller <davem@davemloft.net>
Date: Thu Jun 15 14:31:56 2017 -0400
Merge branch 'r8152-support-new-chips'
when the compilation tests happened, but I've reviewed the changes
coming into net-next in the meantime and didn't see any new usages
of skb data accessors having come in.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/psample')
| -rw-r--r-- | net/psample/psample.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/psample/psample.c b/net/psample/psample.c index 8aa58a918783..3a6ad0f438dc 100644 --- a/net/psample/psample.c +++ b/net/psample/psample.c @@ -264,7 +264,7 @@ void psample_sample_packet(struct psample_group *group, struct sk_buff *skb, int nla_len = nla_total_size(data_len); struct nlattr *nla; - nla = (struct nlattr *)skb_put(nl_skb, nla_len); + nla = skb_put(nl_skb, nla_len); nla->nla_type = PSAMPLE_ATTR_DATA; nla->nla_len = nla_attr_size(data_len); |