diff options
author | Stefan Assmann <sassmann@kpanic.de> | 2014-01-29 10:19:03 +0100 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2014-02-01 00:30:23 +0100 |
commit | 98ee83982e19ad71b1b7bc98ab1a9111cb1a3215 (patch) | |
tree | 2e0afce7ea79f63ba39f3d59be4e90e13f8d43c6 /backport | |
parent | d114f15cbaf8c3c70c88dec96434f7a07077afb3 (diff) |
backports: igb fixes for linux-3.6
- backport mmd_eee_adv_to_ethtool_adv_t
- add define to map ptp_clock_register() to old version
- add patches/collateral-evolutions/network/84-ethernet/0004-igb_err_handler.patch
- add patches/collateral-evolutions/network/84-ethernet/0005-igb_mdi.patch
Signed-off-by: Stefan Assmann <sassmann@kpanic.de>
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
Diffstat (limited to 'backport')
-rw-r--r-- | backport/backport-include/linux/mdio.h | 36 | ||||
-rw-r--r-- | backport/backport-include/linux/ptp_clock_kernel.h | 14 |
2 files changed, 50 insertions, 0 deletions
diff --git a/backport/backport-include/linux/mdio.h b/backport/backport-include/linux/mdio.h new file mode 100644 index 00000000..51620879 --- /dev/null +++ b/backport/backport-include/linux/mdio.h @@ -0,0 +1,36 @@ +#ifndef __BACKPORT_LINUX_MDIO_H +#define __BACKPORT_LINUX_MDIO_H +#include_next <linux/mdio.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) +/** + * mmd_eee_adv_to_ethtool_adv_t + * @eee_adv: value of the MMD EEE Advertisement/Link Partner Ability registers + * + * A small helper function that translates the MMD EEE Advertisment (7.60) + * and MMD EEE Link Partner Ability (7.61) bits to ethtool advertisement + * settings. + */ +#define mmd_eee_adv_to_ethtool_adv_t LINUX_BACKPORT(mmd_eee_adv_to_ethtool_adv_t) +static inline u32 mmd_eee_adv_to_ethtool_adv_t(u16 eee_adv) +{ + u32 adv = 0; + + if (eee_adv & MDIO_EEE_100TX) + adv |= ADVERTISED_100baseT_Full; + if (eee_adv & MDIO_EEE_1000T) + adv |= ADVERTISED_1000baseT_Full; + if (eee_adv & MDIO_EEE_10GT) + adv |= ADVERTISED_10000baseT_Full; + if (eee_adv & MDIO_EEE_1000KX) + adv |= ADVERTISED_1000baseKX_Full; + if (eee_adv & MDIO_EEE_10GKX4) + adv |= ADVERTISED_10000baseKX4_Full; + if (eee_adv & MDIO_EEE_10GKR) + adv |= ADVERTISED_10000baseKR_Full; + + return adv; +} +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ + +#endif /* __BACKPORT_LINUX_MDIO_H */ diff --git a/backport/backport-include/linux/ptp_clock_kernel.h b/backport/backport-include/linux/ptp_clock_kernel.h new file mode 100644 index 00000000..daf1182c --- /dev/null +++ b/backport/backport-include/linux/ptp_clock_kernel.h @@ -0,0 +1,14 @@ +#ifndef __BACKPORT_PTP_CLOCK_KERNEL_H +#define __BACKPORT_PTP_CLOCK_KERNEL_H + +#include <linux/version.h> +#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) +#include_next <linux/ptp_clock_kernel.h> + +#if LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) +#define ptp_clock_register(info,parent) ptp_clock_register(info) +#endif /* LINUX_VERSION_CODE < KERNEL_VERSION(3,7,0) */ + +#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) */ + +#endif /* __BACKPORT_PTP_CLOCK_KERNEL_H */ |