| Message ID | 20140609145539.GB9600@mwanda |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
> -----Original Message----- > From: dept_hsg_linux_nic_dev-bounces@qlclistserver.qlogic.com > [mailto:dept_hsg_linux_nic_dev-bounces@qlclistserver.qlogic.com] On > Behalf Of Dan Carpenter > Sent: Monday, June 09, 2014 7:56 AM > To: Shahed Shaikh > Cc: Dept-HSG Linux NIC Dev; kernel-janitors@vger.kernel.org; netdev > Subject: [patch] qlcnic: remove duplicate QLC_83XX_GET_LSO_CAPABILITY > define > > The QLC_83XX_GET_LSO_CAPABILITY define is cut and pasted twice so we > can delete the second instance. > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> > > diff --git a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h > b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h > index 97784d0..2bf101a 100644 > --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h > +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h > @@ -418,7 +418,6 @@ enum qlcnic_83xx_states { > #define QLC_83XX_GET_FUNC_MODE_FROM_NPAR_INFO(val) (val & > 0x80000000) > #define QLC_83XX_GET_LRO_CAPABILITY(val) (val & 0x20) > #define QLC_83XX_GET_LSO_CAPABILITY(val) (val & 0x40) > -#define QLC_83XX_GET_LSO_CAPABILITY(val) (val & 0x40) > #define QLC_83XX_GET_HW_LRO_CAPABILITY(val) (val & 0x400) Acked-by: Sony Chacko <sony.chacko@qlogic.com> Thanks, Sony -- 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: Dan Carpenter <dan.carpenter@oracle.com> Date: Mon, 9 Jun 2014 17:55:39 +0300 > The QLC_83XX_GET_LSO_CAPABILITY define is cut and pasted twice so we can > delete the second instance. > > Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> Applied. -- 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/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h index 97784d0..2bf101a 100644 --- a/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h +++ b/drivers/net/ethernet/qlogic/qlcnic/qlcnic_83xx_hw.h @@ -418,7 +418,6 @@ enum qlcnic_83xx_states { #define QLC_83XX_GET_FUNC_MODE_FROM_NPAR_INFO(val) (val & 0x80000000) #define QLC_83XX_GET_LRO_CAPABILITY(val) (val & 0x20) #define QLC_83XX_GET_LSO_CAPABILITY(val) (val & 0x40) -#define QLC_83XX_GET_LSO_CAPABILITY(val) (val & 0x40) #define QLC_83XX_GET_HW_LRO_CAPABILITY(val) (val & 0x400) #define QLC_83XX_GET_VLAN_ALIGN_CAPABILITY(val) (val & 0x4000) #define QLC_83XX_GET_FW_LRO_MSS_CAPABILITY(val) (val & 0x20000)
The QLC_83XX_GET_LSO_CAPABILITY define is cut and pasted twice so we can delete the second instance. Signed-off-by: Dan Carpenter <dan.carpenter@oracle.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