| Message ID | 1321625599-3739-1-git-send-email-ian.campbell@citrix.com |
|---|---|
| State | Superseded, archived |
| Delegated to: | David Miller |
| Headers | show |
On Fri, 2011-11-18 at 14:13 +0000, Ian Campbell wrote: > From: Jan Beulich <JBeulich@suse.com> > > Signed-off-by: Jan Beulich <jbeulich@suse.com> > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> I forgot to CC stable@ here. This applies to 2.6.39 onwards. > --- > 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 0cb594c..1ae270e 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, > pending_idx = *((u16 *)skb->data); > xen_netbk_idx_release(netbk, pending_idx); > for (j = start; j < i; j++) { > - pending_idx = frag_get_pending_idx(&shinfo->frags[i]); > + pending_idx = frag_get_pending_idx(&shinfo->frags[j]); > xen_netbk_idx_release(netbk, pending_idx); > } > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, 2011-11-18 at 15:09 +0000, Ian Campbell wrote: > On Fri, 2011-11-18 at 14:13 +0000, Ian Campbell wrote: > > From: Jan Beulich <JBeulich@suse.com> > > > > Signed-off-by: Jan Beulich <jbeulich@suse.com> > > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> > > I forgot to CC stable@ here. This applies to 2.6.39 onwards. I also neglected to change the subject line to the correct upstream function name. Please ignore this patch, I'll try again... Ian. > > > --- > > 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 0cb594c..1ae270e 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, > > pending_idx = *((u16 *)skb->data); > > xen_netbk_idx_release(netbk, pending_idx); > > for (j = start; j < i; j++) { > > - pending_idx = frag_get_pending_idx(&shinfo->frags[i]); > > + pending_idx = frag_get_pending_idx(&shinfo->frags[j]); > > xen_netbk_idx_release(netbk, pending_idx); > > } > > > > > -- > To unsubscribe from this list: send the line "unsubscribe netdev" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html > -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/xen-netback/netback.c b/drivers/net/xen-netback/netback.c index 0cb594c..1ae270e 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, pending_idx = *((u16 *)skb->data); xen_netbk_idx_release(netbk, pending_idx); for (j = start; j < i; j++) { - pending_idx = frag_get_pending_idx(&shinfo->frags[i]); + pending_idx = frag_get_pending_idx(&shinfo->frags[j]); xen_netbk_idx_release(netbk, pending_idx); }