diff options
| author | David S. Miller <davem@davemloft.net> | 2009-05-25 01:42:21 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-05-25 01:42:21 -0700 |
| commit | c649c0e31d5736a4b7c5c3454182091dda4bbe62 (patch) | |
| tree | 93da11bf4ea828611ab5277a7dbadf57724c2b1e /net/core | |
| parent | daebafed7fef54fcc73d2d01431122cfd578d1e0 (diff) | |
| parent | 4e2fd555199977c5994d1a4d2d3b8761b20ca4c7 (diff) | |
| download | kernel_samsung_smdk4412-c649c0e31d5736a4b7c5c3454182091dda4bbe62.zip kernel_samsung_smdk4412-c649c0e31d5736a4b7c5c3454182091dda4bbe62.tar.gz kernel_samsung_smdk4412-c649c0e31d5736a4b7c5c3454182091dda4bbe62.tar.bz2 | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/wireless/ath/ath5k/phy.c
drivers/net/wireless/iwlwifi/iwl-agn.c
drivers/net/wireless/iwlwifi/iwl3945-base.c
Diffstat (limited to 'net/core')
| -rw-r--r-- | net/core/pktgen.c | 2 | ||||
| -rw-r--r-- | net/core/skbuff.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/net/core/pktgen.c b/net/core/pktgen.c index 3779c14..0666a82 100644 --- a/net/core/pktgen.c +++ b/net/core/pktgen.c @@ -2447,7 +2447,7 @@ static inline void free_SAs(struct pktgen_dev *pkt_dev) if (pkt_dev->cflows) { /* let go of the SAs if we have them */ int i = 0; - for (; i < pkt_dev->nflows; i++){ + for (; i < pkt_dev->cflows; i++) { struct xfrm_state *x = pkt_dev->flows[i].x; if (x) { xfrm_state_put(x); diff --git a/net/core/skbuff.c b/net/core/skbuff.c index 47fbbb8..d429c41 100644 --- a/net/core/skbuff.c +++ b/net/core/skbuff.c @@ -2291,7 +2291,7 @@ unsigned int skb_seq_read(unsigned int consumed, const u8 **data, next_skb: block_limit = skb_headlen(st->cur_skb) + st->stepped_offset; - if (abs_offset < block_limit) { + if (abs_offset < block_limit && !st->frag_data) { *data = st->cur_skb->data + (abs_offset - st->stepped_offset); return block_limit - abs_offset; } |