]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
sctp: Correct access to skb->{network, transport}_header
authorSimon Horman <horms@verge.net.au>
Tue, 28 May 2013 20:34:28 +0000 (20:34 +0000)
committerDavid S. Miller <davem@davemloft.net>
Wed, 29 May 2013 06:49:07 +0000 (23:49 -0700)
This corrects an regression introduced by "net: Use 16bits for *_headers
fields of struct skbuff" when NET_SKBUFF_DATA_USES_OFFSET is not set. In
that case sk_buff_data_t will be a pointer, however,
skb->{network,transport}_header is now __u16.

Signed-off-by: Simon Horman <horms@verge.net.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/sctp/input.c
net/sctp/ipv6.c

index 4b2c83146aa7e5c47b46b8148d701a4fc3d2189e..e328fe8f93f47a9314a2dad559003fa21dee845d 100644 (file)
@@ -589,7 +589,7 @@ void sctp_v4_err(struct sk_buff *skb, __u32 info)
        struct sctp_association *asoc = NULL;
        struct sctp_transport *transport;
        struct inet_sock *inet;
-       sk_buff_data_t saveip, savesctp;
+       __be16 saveip, savesctp;
        int err;
        struct net *net = dev_net(skb->dev);
 
index 391a245d520316c865aad51424b94b9fe6fb8bf7..8ee553b499ce5f8b77b1bf2c9c6d4488f87a92d1 100644 (file)
@@ -153,7 +153,7 @@ SCTP_STATIC void sctp_v6_err(struct sk_buff *skb, struct inet6_skb_parm *opt,
        struct sctp_association *asoc;
        struct sctp_transport *transport;
        struct ipv6_pinfo *np;
-       sk_buff_data_t saveip, savesctp;
+       __be16 saveip, savesctp;
        int err;
        struct net *net = dev_net(skb->dev);