| Message ID | 4A5A6DE5.4090801@gmail.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
On Sun, Jul 12, 2009 at 6:12 PM, Roel Kluin<roel.kluin@gmail.com> wrote: > Fix duplicate testing of MCAST flag > > Signed-off-by: Roel Kluin <roel.kluin@gmail.com> > --- > I think the first should be UCAST, correct? > > diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c > index c734b19..204db96 100644 > --- a/drivers/net/atlx/atl2.c > +++ b/drivers/net/atlx/atl2.c > @@ -2071,7 +2071,7 @@ static int atl2_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) > if (wol->wolopts & (WAKE_ARP | WAKE_MAGICSECURE)) > return -EOPNOTSUPP; > > - if (wol->wolopts & (WAKE_MCAST|WAKE_BCAST|WAKE_MCAST)) > + if (wol->wolopts & (WAKE_UCAST | WAKE_BCAST | WAKE_MCAST)) > return -EOPNOTSUPP; > > /* these settings will always override what we currently have */ > Acked-by: Jay Cliburn <jcliburn@gmail.com> -- 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
From: "J. K. Cliburn" <jcliburn@gmail.com> Date: Sun, 12 Jul 2009 19:04:20 -0500 > On Sun, Jul 12, 2009 at 6:12 PM, Roel Kluin<roel.kluin@gmail.com> wrote: >> Fix duplicate testing of MCAST flag >> >> Signed-off-by: Roel Kluin <roel.kluin@gmail.com> > Acked-by: Jay Cliburn <jcliburn@gmail.com> 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
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c index c734b19..204db96 100644 --- a/drivers/net/atlx/atl2.c +++ b/drivers/net/atlx/atl2.c @@ -2071,7 +2071,7 @@ static int atl2_set_wol(struct net_device *netdev, struct ethtool_wolinfo *wol) if (wol->wolopts & (WAKE_ARP | WAKE_MAGICSECURE)) return -EOPNOTSUPP; - if (wol->wolopts & (WAKE_MCAST|WAKE_BCAST|WAKE_MCAST)) + if (wol->wolopts & (WAKE_UCAST | WAKE_BCAST | WAKE_MCAST)) return -EOPNOTSUPP; /* these settings will always override what we currently have */
Fix duplicate testing of MCAST flag Signed-off-by: Roel Kluin <roel.kluin@gmail.com> --- I think the first should be UCAST, correct? -- 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