diff options
| author | David S. Miller <davem@davemloft.net> | 2011-11-26 14:47:03 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2011-11-26 14:47:03 -0500 |
| commit | 6dec4ac4ee1ad894dc0e9647cd3e180f93fc353c (patch) | |
| tree | cd71e597bbbe677820bb229c6aedbad412758959 /drivers/net/xen-netback | |
| parent | d6f03f29f7cdf064289f941bf0b838348e996e65 (diff) | |
| parent | fc0b927d9a5024e138c4318fe19a590f23e3eeec (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
net/ipv4/inet_diag.c
Diffstat (limited to 'drivers/net/xen-netback')
| -rw-r--r-- | drivers/net/xen-netback/netback.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index 0cb594c86090..1ae270eed51a 100644 --- a/drivers/net/xen-netback/netback.c +++ b/drivers/net/xen-netback/netback.c | |||
| @@ -1021,7 +1021,7 @@ static int xen_netbk_tx_check_gop(struct xen_netbk *netbk, | |||
| 1021 | pending_idx = *((u16 *)skb->data); | 1021 | pending_idx = *((u16 *)skb->data); |
| 1022 | xen_netbk_idx_release(netbk, pending_idx); | 1022 | xen_netbk_idx_release(netbk, pending_idx); |
| 1023 | for (j = start; j < i; j++) { | 1023 | for (j = start; j < i; j++) { |
| 1024 | pending_idx = frag_get_pending_idx(&shinfo->frags[i]); | 1024 | pending_idx = frag_get_pending_idx(&shinfo->frags[j]); |
| 1025 | xen_netbk_idx_release(netbk, pending_idx); | 1025 | xen_netbk_idx_release(netbk, pending_idx); |
| 1026 | } | 1026 | } |
| 1027 | 1027 | ||