refresh patches for 2.6.30-rc4

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

diff --git a/target/linux/generic-2.6/patches-2.6.27/630-phy_packets.patch b/target/linux/generic-2.6/patches-2.6.27/630-phy_packets.patch
index f1c1580..b4e8b4d 100644 (file)
--- a/target/linux/generic-2.6/patches-2.6.27/630-phy_packets.patch
+++ b/target/linux/generic-2.6/patches-2.6.27/630-phy_packets.patch
@@ -1,6 +1,6 @@
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c
 --- a/drivers/net/phy/phy_device.c
 +++ b/drivers/net/phy/phy_device.c

-@@ -143,6 +143,18 @@
+@@ -143,6 +143,18 @@ int phy_scan_fixups(struct phy_device *p

  }
  EXPORT_SYMBOL(phy_scan_fixups);
  
  }
  EXPORT_SYMBOL(phy_scan_fixups);
  


@@ -19,7 +19,7 @@
  struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
  {
        struct phy_device *dev;
  struct phy_device* phy_device_create(struct mii_bus *bus, int addr, int phy_id)
  {
        struct phy_device *dev;

-@@ -168,6 +180,8 @@
+@@ -168,6 +180,8 @@ struct phy_device* phy_device_create(str

        dev->bus = bus;
  
        dev->state = PHY_DOWN;
        dev->bus = bus;
  
        dev->state = PHY_DOWN;


@@ -30,7 +30,7 @@
  
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h
  
 --- a/include/linux/phy.h
 +++ b/include/linux/phy.h

-@@ -309,6 +309,17 @@
+@@ -309,6 +309,20 @@ struct phy_device {

        void (*adjust_link)(struct net_device *dev);
  
        void (*adjust_state)(struct net_device *dev);
        void (*adjust_link)(struct net_device *dev);
  
        void (*adjust_state)(struct net_device *dev);


@@ -45,12 +45,15 @@
 +       */
 +      int (*netif_receive_skb)(struct sk_buff *skb);
 +      int (*netif_rx)(struct sk_buff *skb);
 +       */
 +      int (*netif_receive_skb)(struct sk_buff *skb);
 +      int (*netif_rx)(struct sk_buff *skb);

++
++      /* alignment offset for packets */
++      int pkt_align;

  };
  #define to_phy_device(d) container_of(d, struct phy_device, dev)
  
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h
  };
  #define to_phy_device(d) container_of(d, struct phy_device, dev)
  
 --- a/include/linux/netdevice.h
 +++ b/include/linux/netdevice.h

-@@ -613,6 +613,7 @@
+@@ -613,6 +613,7 @@ struct net_device

        void                    *ax25_ptr;      /* AX.25 specific data */
        struct wireless_dev     *ieee80211_ptr; /* IEEE 802.11 specific data,
                                                   assign before registering */
        void                    *ax25_ptr;      /* AX.25 specific data */
        struct wireless_dev     *ieee80211_ptr; /* IEEE 802.11 specific data,
                                                   assign before registering */