aboutsummaryrefslogtreecommitdiff
path: root/net/sctp
diff options
context:
space:
mode:
authorSimon Horman <horms@verge.net.au>2013-05-28 20:34:28 +0000
committerDavid S. Miller <davem@davemloft.net>2013-05-28 23:49:07 -0700
commit158874cac61245b84e939c92c53db7000122b7b0 (patch)
tree0a425098fbfcf0001892f6d30519d476420b4aac /net/sctp
parentf7c0c2ae843b74f8dba55820cb0a3de19c976703 (diff)
downloadlinux-158874cac61245b84e939c92c53db7000122b7b0.tar.gz
sctp: Correct access to skb->{network, transport}_header
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>
Diffstat (limited to 'net/sctp')
-rw-r--r--net/sctp/input.c2
-rw-r--r--net/sctp/ipv6.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/sctp/input.c b/net/sctp/input.c
index 4b2c83146aa..e328fe8f93f 100644
--- a/net/sctp/input.c
+++ b/net/sctp/input.c
@@ -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);
diff --git a/net/sctp/ipv6.c b/net/sctp/ipv6.c
index 391a245d520..8ee553b499c 100644
--- a/net/sctp/ipv6.c
+++ b/net/sctp/ipv6.c
@@ -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);