| Submitter | Jeff Kirsher |
|---|---|
| Date | Dec. 12, 2008, 9:52 a.m. |
| Message ID | <20081212095221.4416.83327.stgit@lost.foo-projects.org> |
| Download | mbox | patch |
| Permalink | /patch/13693/ |
| State | Changes Requested |
| Delegated to: | David Miller |
| Headers | show |
Comments
From: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Date: Fri, 12 Dec 2008 01:52:21 -0800 > DCB had no way to know if setstate had failed in the driver. This > patch enables dcb netlink code to handle the status for the DCB > setstate interface. > > Signed-off-by: Don Skidmore <donald.c.skidmore@intel.com> > Signed-off-by: Eric W Multanen <eric.w.multanen@intel.com> > Signed-off-by: Peter P Waskiewicz Jr <peter.p.waskiewicz.jr@intel.com> > Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> How can this build if you don't also update ixgbe_dcbnl_set_state() et al. to have a "u8" instead of a "void" return value too? Oh I see, you send the update two patches later. Don't do that, it breaks GIT bisect. If you change the prototype for a method function, you must also change all implementations of that method to match at the same time. I've dropped both changes. -- 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
Patch
diff --git a/include/net/dcbnl.h b/include/net/dcbnl.h index 91e0a3d..775cfc8 100644 --- a/include/net/dcbnl.h +++ b/include/net/dcbnl.h @@ -26,7 +26,7 @@ */ struct dcbnl_rtnl_ops { u8 (*getstate)(struct net_device *); - void (*setstate)(struct net_device *, u8); + u8 (*setstate)(struct net_device *, u8); void (*getpermhwaddr)(struct net_device *, u8 *); void (*setpgtccfgtx)(struct net_device *, int, u8, u8, u8, u8); void (*setpgbwgcfgtx)(struct net_device *, int, u8); diff --git a/net/dcb/dcbnl.c b/net/dcb/dcbnl.c index 79a351d..d0c12f0 100644 --- a/net/dcb/dcbnl.c +++ b/net/dcb/dcbnl.c @@ -714,9 +714,8 @@ static int dcbnl_setstate(struct net_device *netdev, struct nlattr **tb, value = nla_get_u8(tb[DCB_ATTR_STATE]); - netdev->dcbnl_ops->setstate(netdev, value); - - ret = dcbnl_reply(0, RTM_SETDCB, DCB_CMD_SSTATE, DCB_ATTR_STATE, + ret = dcbnl_reply(netdev->dcbnl_ops->setstate(netdev, value), + RTM_SETDCB, DCB_CMD_SSTATE, DCB_ATTR_STATE, pid, seq, flags); return ret;