projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into for-upstream
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
net
/
core
/
pktgen.c
diff --git
a/net/core/pktgen.c
b/net/core/pktgen.c
index a756847e3814e5fc9e425f105acfd2984eccb33a..99f656d35b4f5556be314cbb3ec4c732228f5709 100644
(file)
--- a/
net/core/pktgen.c
+++ b/
net/core/pktgen.c
@@
-2474,7
+2474,7
@@
static inline int process_ipsec(struct pktgen_dev *pkt_dev,
if (ret < 0) {
printk(KERN_ERR "Error expanding "
"ipsec packet %d\n",ret);
if (ret < 0) {
printk(KERN_ERR "Error expanding "
"ipsec packet %d\n",ret);
-
return 0
;
+
goto err
;
}
}
}
}
@@
-2484,8
+2484,7
@@
static inline int process_ipsec(struct pktgen_dev *pkt_dev,
if (ret) {
printk(KERN_ERR "Error creating ipsec "
"packet %d\n",ret);
if (ret) {
printk(KERN_ERR "Error creating ipsec "
"packet %d\n",ret);
- kfree_skb(skb);
- return 0;
+ goto err;
}
/* restore ll */
eth = (__u8 *) skb_push(skb, ETH_HLEN);
}
/* restore ll */
eth = (__u8 *) skb_push(skb, ETH_HLEN);
@@
-2494,6
+2493,9
@@
static inline int process_ipsec(struct pktgen_dev *pkt_dev,
}
}
return 1;
}
}
return 1;
+err:
+ kfree_skb(skb);
+ return 0;
}
#endif
}
#endif