diff options
| -rw-r--r-- | net/core/skbuff.c | 4 | ||||
| -rw-r--r-- | net/netlink/af_netlink.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index af9185d0be6a..cfd777bd6bd0 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c | |||
| @@ -195,7 +195,7 @@ struct sk_buff *__alloc_skb_head(gfp_t gfp_mask, int node) | |||
| 195 | * the tail pointer in struct sk_buff! | 195 | * the tail pointer in struct sk_buff! |
| 196 | */ | 196 | */ |
| 197 | memset(skb, 0, offsetof(struct sk_buff, tail)); | 197 | memset(skb, 0, offsetof(struct sk_buff, tail)); |
| 198 | skb->data = NULL; | 198 | skb->head = NULL; |
| 199 | skb->truesize = sizeof(struct sk_buff); | 199 | skb->truesize = sizeof(struct sk_buff); |
| 200 | atomic_set(&skb->users, 1); | 200 | atomic_set(&skb->users, 1); |
| 201 | 201 | ||
| @@ -611,7 +611,7 @@ static void skb_release_head_state(struct sk_buff *skb) | |||
| 611 | static void skb_release_all(struct sk_buff *skb) | 611 | static void skb_release_all(struct sk_buff *skb) |
| 612 | { | 612 | { |
| 613 | skb_release_head_state(skb); | 613 | skb_release_head_state(skb); |
| 614 | if (likely(skb->data)) | 614 | if (likely(skb->head)) |
| 615 | skb_release_data(skb); | 615 | skb_release_data(skb); |
| 616 | } | 616 | } |
| 617 | 617 | ||
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 12ac6b47a35c..d0b3dd60d386 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c | |||
| @@ -747,7 +747,7 @@ static void netlink_skb_destructor(struct sk_buff *skb) | |||
| 747 | atomic_dec(&ring->pending); | 747 | atomic_dec(&ring->pending); |
| 748 | sock_put(sk); | 748 | sock_put(sk); |
| 749 | 749 | ||
| 750 | skb->data = NULL; | 750 | skb->head = NULL; |
| 751 | } | 751 | } |
| 752 | #endif | 752 | #endif |
| 753 | if (skb->sk != NULL) | 753 | if (skb->sk != NULL) |
