git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...
[linux-2.6.git]
/
net
/
ipv4
/
af_inet.c
diff --git
a/net/ipv4/af_inet.c
b/net/ipv4/af_inet.c
index
5537aeb
..
7351fa1
100644
(file)
--- a/
net/ipv4/af_inet.c
+++ b/
net/ipv4/af_inet.c
@@
-67,6
+67,7
@@
* 2 of the License, or (at your option) any later version.
*/
* 2 of the License, or (at your option) any later version.
*/
+#include <linux/config.h>
#include <linux/err.h>
#include <linux/errno.h>
#include <linux/types.h>
#include <linux/err.h>
#include <linux/errno.h>
#include <linux/types.h>
@@
-1200,15
+1201,7
@@
static struct sk_buff *inet_gso_segment(struct sk_buff *skb, int features)
int ihl;
int id;
int ihl;
int id;
- if (unlikely(skb_shinfo(skb)->gso_type &
- ~(SKB_GSO_TCPV4 |
- SKB_GSO_UDP |
- SKB_GSO_DODGY |
- SKB_GSO_TCP_ECN |
- 0)))
- goto out;
-
- if (unlikely(!pskb_may_pull(skb, sizeof(*iph))))
+ if (!pskb_may_pull(skb, sizeof(*iph)))
goto out;
iph = skb->nh.iph;
goto out;
iph = skb->nh.iph;
@@
-1216,7
+1209,7
@@
static struct sk_buff *inet_gso_segment(struct sk_buff *skb, int features)
if (ihl < sizeof(*iph))
goto out;
if (ihl < sizeof(*iph))
goto out;
- if (
unlikely(!pskb_may_pull(skb, ihl)
))
+ if (
!pskb_may_pull(skb, ihl
))
goto out;
skb->h.raw = __skb_pull(skb, ihl);
goto out;
skb->h.raw = __skb_pull(skb, ihl);
@@
-1227,7
+1220,7
@@
static struct sk_buff *inet_gso_segment(struct sk_buff *skb, int features)
rcu_read_lock();
ops = rcu_dereference(inet_protos[proto]);
rcu_read_lock();
ops = rcu_dereference(inet_protos[proto]);
- if (
likely(ops && ops->gso_segment)
)
+ if (
ops && ops->gso_segment
)
segs = ops->gso_segment(skb, features);
rcu_read_unlock();
segs = ops->gso_segment(skb, features);
rcu_read_unlock();