diff options
author | Florian Fainelli <florian@openwrt.org> | 2009-05-28 15:55:54 +0000 |
---|---|---|
committer | Florian Fainelli <florian@openwrt.org> | 2009-05-28 15:55:54 +0000 |
commit | cec852c0870d3df36ed9e5bc03b6ff70f4d67c75 (patch) | |
tree | 0d7958494894e9ffae1853f3ee7fe3ce0f788b61 /target/linux/generic-2.4/patches/803-mii_ioctl.patch | |
parent | b7ae5e7b7cb2cb23effc6007b5bc8527be22e054 (diff) | |
download | upstream-cec852c0870d3df36ed9e5bc03b6ff70f4d67c75.tar.gz upstream-cec852c0870d3df36ed9e5bc03b6ff70f4d67c75.tar.bz2 upstream-cec852c0870d3df36ed9e5bc03b6ff70f4d67c75.zip |
update to 2.4.37, tested on wrt54gs (#4766)
SVN-Revision: 16144
Diffstat (limited to 'target/linux/generic-2.4/patches/803-mii_ioctl.patch')
-rw-r--r-- | target/linux/generic-2.4/patches/803-mii_ioctl.patch | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/target/linux/generic-2.4/patches/803-mii_ioctl.patch b/target/linux/generic-2.4/patches/803-mii_ioctl.patch deleted file mode 100644 index 86b0309d4a..0000000000 --- a/target/linux/generic-2.4/patches/803-mii_ioctl.patch +++ /dev/null @@ -1,63 +0,0 @@ ---- a/include/linux/mii.h -+++ b/include/linux/mii.h -@@ -9,7 +9,6 @@ - #define __LINUX_MII_H__ - - #include <linux/types.h> --#include <linux/if.h> - - /* Generic MII registers. */ - -@@ -104,6 +103,19 @@ - #define NWAYTEST_LOOPBACK 0x0100 /* Enable loopback for N-way */ - #define NWAYTEST_RESV2 0xfe00 /* Unused... */ - -+/* This structure is used in all SIOCxMIIxxx ioctl calls */ -+struct mii_ioctl_data { -+ __u16 phy_id; -+ __u16 reg_num; -+ __u16 val_in; -+ __u16 val_out; -+}; -+ -+#ifdef __KERNEL__ -+ -+#include <linux/if.h> -+ -+struct ethtool_cmd; - - struct mii_if_info { - int phy_id; -@@ -119,9 +131,6 @@ struct mii_if_info { - void (*mdio_write) (struct net_device *dev, int phy_id, int location, int val); - }; - --struct ethtool_cmd; --struct mii_ioctl_data; -- - extern int mii_link_ok (struct mii_if_info *mii); - extern int mii_nway_restart (struct mii_if_info *mii); - extern int mii_ethtool_gset(struct mii_if_info *mii, struct ethtool_cmd *ecmd); -@@ -136,15 +145,6 @@ extern int generic_mii_ioctl(struct mii_ - - - --/* This structure is used in all SIOCxMIIxxx ioctl calls */ --struct mii_ioctl_data { -- u16 phy_id; -- u16 reg_num; -- u16 val_in; -- u16 val_out; --}; -- -- - static inline struct mii_ioctl_data *if_mii(struct ifreq *rq) - { - return (struct mii_ioctl_data *) &rq->ifr_ifru; -@@ -202,5 +202,5 @@ static inline unsigned int mii_duplex (u - return 0; - } - -- -+#endif /* __KERNEL__ */ - #endif /* __LINUX_MII_H__ */ |