Message ID | 1300161043.2649.33.camel@edumazet-laptop |
---|---|
State | Accepted, archived |
Delegated to: | David Miller |
Headers | show |
From: Eric Dumazet <eric.dumazet@gmail.com> Date: Tue, 15 Mar 2011 04:50:43 +0100 > Le lundi 14 mars 2011 à 15:10 -0700, David Miller a écrit : >> From: Ian Campbell <ian.campbell@citrix.com> >> Date: Thu, 10 Mar 2011 17:04:18 +0000 >> >> > Fixup the rx_gso_checksum_fixup field added in e0ce4af920eb to be >> > unsigned long as suggested by Ben Hutchings in >> > <1298919198.2569.14.camel@bwh-desktop> >> > >> > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> >> >> Applied, thanks Ian. > > Hmm, this needs this followup patch then. > > Thanks > > [PATCH] xen: netfront: fix xennet_get_ethtool_stats() > > commit e9a799ea4a5551d2 (xen: netfront: ethtool stats fields should be > unsigned long) made rx_gso_checksum_fixup an unsigned long. > > Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> I even saw your feedback but for some reason I still applied his patch, sorry about that :-) Applied, thanks. -- 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 Tue, 2011-03-15 at 04:06 +0000, David Miller wrote: > From: Eric Dumazet <eric.dumazet@gmail.com> > Date: Tue, 15 Mar 2011 04:50:43 +0100 > > > Le lundi 14 mars 2011 à 15:10 -0700, David Miller a écrit : > >> From: Ian Campbell <ian.campbell@citrix.com> > >> Date: Thu, 10 Mar 2011 17:04:18 +0000 > >> > >> > Fixup the rx_gso_checksum_fixup field added in e0ce4af920eb to be > >> > unsigned long as suggested by Ben Hutchings in > >> > <1298919198.2569.14.camel@bwh-desktop> > >> > > >> > Signed-off-by: Ian Campbell <ian.campbell@citrix.com> > >> > >> Applied, thanks Ian. > > > > Hmm, this needs this followup patch then. > > > > Thanks > > > > [PATCH] xen: netfront: fix xennet_get_ethtool_stats() > > > > commit e9a799ea4a5551d2 (xen: netfront: ethtool stats fields should be > > unsigned long) made rx_gso_checksum_fixup an unsigned long. > > > > Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> > > I even saw your feedback but for some reason I still applied > his patch, sorry about that :-) > > Applied, thanks. His feed back was for netback and this was a netfront patch, but I didn't make the link either. Thanks for picking it up Eric. Ian. -- 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-netfront.c b/drivers/net/xen-netfront.c index 27cf72f..5b399b5 100644 --- a/drivers/net/xen-netfront.c +++ b/drivers/net/xen-netfront.c @@ -1692,7 +1692,7 @@ static void xennet_get_ethtool_stats(struct net_device *dev, int i; for (i = 0; i < ARRAY_SIZE(xennet_stats); i++) - data[i] = *(int *)(np + xennet_stats[i].offset); + data[i] = *(unsigned long *)(np + xennet_stats[i].offset); } static void xennet_get_strings(struct net_device *dev, u32 stringset, u8 * data)