diff options
| author |   David S. Miller <davem@davemloft.net> | 2008-04-14 02:30:23 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-04-14 02:30:23 -0700 |
| commit | df39e8ba56a788733d369068c7319e04b1da3cd5 (patch) | |
| tree | 1e9be853bdb455e341cdbf957656f342cfa2eb9e /net/core | |
| parent | [SKB]: __skb_queue_tail = __skb_insert before (diff) | |
| parent | [BRIDGE]: Fix crash in __ip_route_output_key with bridge netfilter (diff) | |
| download | linux-dev-df39e8ba56a788733d369068c7319e04b1da3cd5.tar.xz linux-dev-df39e8ba56a788733d369068c7319e04b1da3cd5.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ehea/ehea_main.c
drivers/net/wireless/iwlwifi/Kconfig
drivers/net/wireless/rt2x00/rt61pci.c
net/ipv4/inet_timewait_sock.c
net/ipv6/raw.c
net/mac80211/ieee80211_sta.c
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/skbuff.c | 4 | ||||
| -rw-r--r-- | net/core/sock.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 4cd12d99b12e..4fe605fa6f8a 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -2225,8 +2225,8 @@ EXPORT_SYMBOL_GPL(skb_pull_rcsum); * @features: features for the output path (see dev->features) * * This function performs segmentation on the given skb. It returns - * the segment at the given position. It returns NULL if there are - * no more segments to generate, or when an error is encountered. + * a pointer to the first in a list of new skbs for the segments. + * In case of error it returns ERR_PTR(err). */ struct sk_buff *skb_segment(struct sk_buff *skb, int features) { diff --git a/net/core/sock.c b/net/core/sock.c index f2ccb1620dc4..c0ecbdcf75d8 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1746,7 +1746,7 @@ void sock_init_data(struct socket *sock, struct sock *sk) sk->sk_rcvtimeo = MAX_SCHEDULE_TIMEOUT; sk->sk_sndtimeo = MAX_SCHEDULE_TIMEOUT; - sk->sk_stamp = ktime_set(-1L, -1L); + sk->sk_stamp = ktime_set(-1L, 0); atomic_set(&sk->sk_refcnt, 1); atomic_set(&sk->sk_drops, 0); |