[kernel] update to 2.6.28.4

[openwrt.git] / target / linux / generic-2.6 / patches-2.6.25 / 630-phy_packets.patch

diff --git a/target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch b/target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch
index e5947e1..6115487 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch
+++ b/target/linux/generic-2.6/patches-2.6.25/630-phy_packets.patch
@@ -1,7 +1,5 @@
-Index: linux-2.6.25.4/drivers/net/phy/phy_device.c
-===================================================================
---- linux-2.6.25.4.orig/drivers/net/phy/phy_device.c
-+++ linux-2.6.25.4/drivers/net/phy/phy_device.c
+--- a/drivers/net/phy/phy_device.c
++++ b/drivers/net/phy/phy_device.c

 @@ -53,6 +53,18 @@ static void phy_device_release(struct de
        phy_device_free(to_phy_device(dev));
  }
 @@ -53,6 +53,18 @@ static void phy_device_release(struct de
        phy_device_free(to_phy_device(dev));
  }


@@ -30,10 +28,8 @@ Index: linux-2.6.25.4/drivers/net/phy/phy_device.c
  
        mutex_init(&dev->lock);
  
  
        mutex_init(&dev->lock);
  

-Index: linux-2.6.25.4/include/linux/phy.h
-===================================================================
---- linux-2.6.25.4.orig/include/linux/phy.h
-+++ linux-2.6.25.4/include/linux/phy.h
+--- a/include/linux/phy.h
++++ b/include/linux/phy.h

 @@ -295,6 +295,17 @@ struct phy_device {
        void (*adjust_link)(struct net_device *dev);
  
 @@ -295,6 +295,17 @@ struct phy_device {
        void (*adjust_link)(struct net_device *dev);
  


@@ -52,10 +48,8 @@ Index: linux-2.6.25.4/include/linux/phy.h
  };
  #define to_phy_device(d) container_of(d, struct phy_device, dev)
  
  };
  #define to_phy_device(d) container_of(d, struct phy_device, dev)
  

-Index: linux-2.6.25.4/include/linux/netdevice.h
-===================================================================
---- linux-2.6.25.4.orig/include/linux/netdevice.h
-+++ linux-2.6.25.4/include/linux/netdevice.h
+--- a/include/linux/netdevice.h
++++ b/include/linux/netdevice.h

 @@ -595,6 +595,7 @@ struct net_device
        void                    *ax25_ptr;      /* AX.25 specific data */
        struct wireless_dev     *ieee80211_ptr; /* IEEE 802.11 specific data,
 @@ -595,6 +595,7 @@ struct net_device
        void                    *ax25_ptr;      /* AX.25 specific data */
        struct wireless_dev     *ieee80211_ptr; /* IEEE 802.11 specific data,