diff options
Diffstat (limited to 'patches/collateral-evolutions')
14 files changed, 24 insertions, 24 deletions
diff --git a/patches/collateral-evolutions/generic/0001-sysfs-api/drivers_ssb.patch b/patches/collateral-evolutions/generic/0001-sysfs-api/drivers_ssb.patch index e9b09134..5fa2e98e 100644 --- a/patches/collateral-evolutions/generic/0001-sysfs-api/drivers_ssb.patch +++ b/patches/collateral-evolutions/generic/0001-sysfs-api/drivers_ssb.patch @@ -25,7 +25,7 @@ }; static void ssb_buses_lock(void) -@@ -1463,6 +1472,7 @@ static int __init ssb_modinit(void) +@@ -1459,6 +1468,7 @@ static int __init ssb_modinit(void) { int err; diff --git a/patches/collateral-evolutions/generic/0001-sysfs-api/net_ieee802154_wpan-class.patch b/patches/collateral-evolutions/generic/0001-sysfs-api/net_ieee802154_wpan-class.patch index 8099fabc..a6338c6b 100644 --- a/patches/collateral-evolutions/generic/0001-sysfs-api/net_ieee802154_wpan-class.patch +++ b/patches/collateral-evolutions/generic/0001-sysfs-api/net_ieee802154_wpan-class.patch @@ -25,7 +25,7 @@ }; static DEFINE_MUTEX(wpan_phy_mutex); -@@ -203,6 +212,7 @@ EXPORT_SYMBOL(wpan_phy_free); +@@ -197,6 +206,7 @@ EXPORT_SYMBOL(wpan_phy_free); static int __init wpan_phy_class_init(void) { int rc; diff --git a/patches/collateral-evolutions/generic/0001-sysfs-api/net_wireless_sysfs.patch b/patches/collateral-evolutions/generic/0001-sysfs-api/net_wireless_sysfs.patch index e6762198..9c532c29 100644 --- a/patches/collateral-evolutions/generic/0001-sysfs-api/net_wireless_sysfs.patch +++ b/patches/collateral-evolutions/generic/0001-sysfs-api/net_wireless_sysfs.patch @@ -13,7 +13,7 @@ static void wiphy_dev_release(struct device *dev) { -@@ -151,7 +156,11 @@ struct class ieee80211_class = { +@@ -149,7 +154,11 @@ struct class ieee80211_class = { .name = "ieee80211", .owner = THIS_MODULE, .dev_release = wiphy_dev_release, @@ -25,7 +25,7 @@ .dev_uevent = wiphy_uevent, #ifdef CONFIG_PM .suspend = wiphy_suspend, -@@ -165,6 +174,7 @@ struct class ieee80211_class = { +@@ -161,6 +170,7 @@ struct class ieee80211_class = { int wiphy_sysfs_init(void) { diff --git a/patches/collateral-evolutions/network/0002-disable-dump-adjust-on-old-kernels.patch b/patches/collateral-evolutions/network/0002-disable-dump-adjust-on-old-kernels.patch index 94dc764b..195633c3 100644 --- a/patches/collateral-evolutions/network/0002-disable-dump-adjust-on-old-kernels.patch +++ b/patches/collateral-evolutions/network/0002-disable-dump-adjust-on-old-kernels.patch @@ -28,7 +28,7 @@ Date: Fri Mar 1 14:03:49 2013 +0100 --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -1727,6 +1727,7 @@ static int nl80211_dump_wiphy(struct sk_ +@@ -1731,6 +1731,7 @@ static int nl80211_dump_wiphy(struct sk_ cb->nlh->nlmsg_seq, NLM_F_MULTI, state); if (ret < 0) { @@ -36,7 +36,7 @@ Date: Fri Mar 1 14:03:49 2013 +0100 /* * If sending the wiphy data didn't fit (ENOBUFS * or EMSGSIZE returned), this SKB is still -@@ -1748,6 +1749,7 @@ static int nl80211_dump_wiphy(struct sk_ +@@ -1752,6 +1753,7 @@ static int nl80211_dump_wiphy(struct sk_ rtnl_unlock(); return 1; } diff --git a/patches/collateral-evolutions/network/0003-cfg80211-wext-padding/include_net_cfg80211.patch b/patches/collateral-evolutions/network/0003-cfg80211-wext-padding/include_net_cfg80211.patch index 23c67436..15f501eb 100644 --- a/patches/collateral-evolutions/network/0003-cfg80211-wext-padding/include_net_cfg80211.patch +++ b/patches/collateral-evolutions/network/0003-cfg80211-wext-padding/include_net_cfg80211.patch @@ -1,6 +1,6 @@ --- a/include/net/cfg80211.h +++ b/include/net/cfg80211.h -@@ -2906,6 +2906,9 @@ struct wiphy_vendor_command { +@@ -2909,6 +2909,9 @@ struct wiphy_vendor_command { struct wiphy { /* assign these fields before you register the wiphy */ diff --git a/patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch b/patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch index c445ea04..65d92f64 100644 --- a/patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch +++ b/patches/collateral-evolutions/network/0014-netlink_seq/net_wireless_nl80211.patch @@ -1,6 +1,6 @@ --- a/net/wireless/nl80211.c +++ b/net/wireless/nl80211.c -@@ -6074,7 +6074,9 @@ static int nl80211_dump_scan(struct sk_b +@@ -6092,7 +6092,9 @@ static int nl80211_dump_scan(struct sk_b spin_lock_bh(&rdev->bss_lock); cfg80211_bss_expire(rdev); diff --git a/patches/collateral-evolutions/network/0017-get_ts_info/drivers_net_usb_usbnet.patch b/patches/collateral-evolutions/network/0017-get_ts_info/drivers_net_usb_usbnet.patch index 52215736..c19f6b10 100644 --- a/patches/collateral-evolutions/network/0017-get_ts_info/drivers_net_usb_usbnet.patch +++ b/patches/collateral-evolutions/network/0017-get_ts_info/drivers_net_usb_usbnet.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1020,7 +1020,9 @@ static const struct ethtool_ops usbnet_e +@@ -1022,7 +1022,9 @@ static const struct ethtool_ops usbnet_e .get_drvinfo = usbnet_get_drvinfo, .get_msglevel = usbnet_get_msglevel, .set_msglevel = usbnet_set_msglevel, diff --git a/patches/collateral-evolutions/network/0020-tty-termios/net_bluetooth_rfcomm_tty.patch b/patches/collateral-evolutions/network/0020-tty-termios/net_bluetooth_rfcomm_tty.patch index 5993b923..780d0b97 100644 --- a/patches/collateral-evolutions/network/0020-tty-termios/net_bluetooth_rfcomm_tty.patch +++ b/patches/collateral-evolutions/network/0020-tty-termios/net_bluetooth_rfcomm_tty.patch @@ -1,6 +1,6 @@ --- a/net/bluetooth/rfcomm/tty.c +++ b/net/bluetooth/rfcomm/tty.c -@@ -873,7 +873,11 @@ static int rfcomm_tty_ioctl(struct tty_s +@@ -869,7 +869,11 @@ static int rfcomm_tty_ioctl(struct tty_s static void rfcomm_tty_set_termios(struct tty_struct *tty, struct ktermios *old) { diff --git a/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch b/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch index bddfd78a..f6237882 100644 --- a/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch +++ b/patches/collateral-evolutions/network/0024-led-blink-api/mac80211.patch @@ -1,6 +1,6 @@ --- a/net/mac80211/ieee80211_i.h +++ b/net/mac80211/ieee80211_i.h -@@ -1165,6 +1165,9 @@ struct ieee80211_local { +@@ -1160,6 +1160,9 @@ struct ieee80211_local { u32 dot11TransmittedFrameCount; #ifdef CONFIG_MAC80211_LEDS diff --git a/patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch b/patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch index 9aaf5819..81b451ad 100644 --- a/patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch +++ b/patches/collateral-evolutions/network/0025-usb-sg/usbnet.patch @@ -1,6 +1,6 @@ --- a/drivers/net/usb/usbnet.c +++ b/drivers/net/usb/usbnet.c -@@ -1225,6 +1225,7 @@ EXPORT_SYMBOL_GPL(usbnet_tx_timeout); +@@ -1227,6 +1227,7 @@ EXPORT_SYMBOL_GPL(usbnet_tx_timeout); /*-------------------------------------------------------------------------*/ @@ -8,7 +8,7 @@ static int build_dma_sg(const struct sk_buff *skb, struct urb *urb) { unsigned num_sgs, total_len = 0; -@@ -1257,6 +1258,12 @@ static int build_dma_sg(const struct sk_ +@@ -1259,6 +1260,12 @@ static int build_dma_sg(const struct sk_ return 1; } @@ -21,7 +21,7 @@ netdev_tx_t usbnet_start_xmit (struct sk_buff *skb, struct net_device *net) -@@ -1313,12 +1320,19 @@ netdev_tx_t usbnet_start_xmit (struct sk +@@ -1315,12 +1322,19 @@ netdev_tx_t usbnet_start_xmit (struct sk if (!(info->flags & FLAG_SEND_ZLP)) { if (!(info->flags & FLAG_MULTI_PACKET)) { length++; @@ -41,7 +41,7 @@ } } else urb->transfer_flags |= URB_ZERO_PACKET; -@@ -1373,7 +1387,9 @@ not_drop: +@@ -1375,7 +1389,9 @@ not_drop: if (skb) dev_kfree_skb_any (skb); if (urb) { @@ -51,7 +51,7 @@ usb_free_urb(urb); } } else -@@ -1426,7 +1442,9 @@ static void usbnet_bh (unsigned long par +@@ -1428,7 +1444,9 @@ static void usbnet_bh (unsigned long par rx_process (dev, skb); continue; case tx_done: @@ -61,7 +61,7 @@ case rx_cleanup: usb_free_urb (entry->urb); dev_kfree_skb (skb); -@@ -1781,7 +1799,9 @@ int usbnet_resume (struct usb_interface +@@ -1783,7 +1801,9 @@ int usbnet_resume (struct usb_interface retval = usb_submit_urb(res, GFP_ATOMIC); if (retval < 0) { dev_kfree_skb_any(skb); diff --git a/patches/collateral-evolutions/network/0027-genl-const/ieee802154.patch b/patches/collateral-evolutions/network/0027-genl-const/ieee802154.patch index f6e20aae..22e45e61 100644 --- a/patches/collateral-evolutions/network/0027-genl-const/ieee802154.patch +++ b/patches/collateral-evolutions/network/0027-genl-const/ieee802154.patch @@ -10,7 +10,7 @@ IEEE802154_DUMP(IEEE802154_LIST_PHY, ieee802154_list_phy, ieee802154_dump_phy), @@ -126,7 +126,7 @@ static const struct genl_ops ieee8021154 - ieee802154_dump_iface), + IEEE802154_OP(IEEE802154_SET_MACPARAMS, ieee802154_set_macparams), }; -static const struct genl_multicast_group ieee802154_mcgrps[] = { diff --git a/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch b/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch index 3fbd8df3..b78d2bc4 100644 --- a/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch +++ b/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch @@ -21,7 +21,7 @@ [NL80211_MCGRP_CONFIG] = { .name = "config", }, [NL80211_MCGRP_SCAN] = { .name = "scan", }, [NL80211_MCGRP_REGULATORY] = { .name = "regulatory", }, -@@ -9270,7 +9270,7 @@ static int nl80211_set_qos_map(struct sk +@@ -9288,7 +9288,7 @@ static int nl80211_set_qos_map(struct sk #define NL80211_FLAG_NEED_WDEV_UP (NL80211_FLAG_NEED_WDEV |\ NL80211_FLAG_CHECK_NETDEV_UP) @@ -30,7 +30,7 @@ struct genl_info *info) { struct cfg80211_registered_device *rdev; -@@ -9339,7 +9339,7 @@ static int nl80211_pre_doit(const struct +@@ -9357,7 +9357,7 @@ static int nl80211_pre_doit(const struct return 0; } @@ -39,7 +39,7 @@ struct genl_info *info) { if (info->user_ptr[1]) { -@@ -9356,7 +9356,7 @@ static void nl80211_post_doit(const stru +@@ -9374,7 +9374,7 @@ static void nl80211_post_doit(const stru rtnl_unlock(); } diff --git a/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch b/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch index b4b81512..2e695f5b 100644 --- a/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch +++ b/patches/collateral-evolutions/network/0028-select_queue/mac80211.patch @@ -2,7 +2,7 @@ diff --git a/net/mac80211/iface.c b/net/mac80211/iface.c index 088111a..dcf149a 100644 --- a/net/mac80211/iface.c +++ b/net/mac80211/iface.c -@@ -1062,10 +1062,19 @@ static void ieee80211_uninit(struct net_ +@@ -1052,10 +1052,19 @@ static void ieee80211_uninit(struct net_ ieee80211_teardown_sdata(IEEE80211_DEV_TO_SUB_IF(dev)); } @@ -22,7 +22,7 @@ index 088111a..dcf149a 100644 { return ieee80211_select_queue(IEEE80211_DEV_TO_SUB_IF(dev), skb); } -@@ -1081,10 +1090,19 @@ static const struct net_device_ops ieee8 +@@ -1071,10 +1080,19 @@ static const struct net_device_ops ieee8 .ndo_select_queue = ieee80211_netdev_select_queue, }; diff --git a/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch b/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch index db9ed6e5..215a0f41 100644 --- a/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch +++ b/patches/collateral-evolutions/network/0028-select_queue/mwifiex.patch @@ -2,7 +2,7 @@ diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/ index 9d3d275..f8b16f4 100644 --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c -@@ -746,9 +746,18 @@ static struct net_device_stats *mwifiex_ +@@ -747,9 +747,18 @@ static struct net_device_stats *mwifiex_ return &priv->stats; } |