* [PATCH 0/4] backports: bring backports to next-20140905
@ 2014-09-06 23:23 Hauke Mehrtens
2014-09-06 23:23 ` [PATCH 1/4] backports: adapt api change of rchan_callbacks->create_buf_file in ath10k Hauke Mehrtens
` (3 more replies)
0 siblings, 4 replies; 5+ messages in thread
From: Hauke Mehrtens @ 2014-09-06 23:23 UTC (permalink / raw
To: backports; +Cc: Hauke Mehrtens
Just some small changes needed to get it to next-20130905.
Hauke Mehrtens (4):
backports: adapt api change of rchan_callbacks->create_buf_file in
ath10k
backports: bluetooth revert patch adding write_iter
backports: remove usage of skbuff->xmit_more
backports: refresh patches on next-20140905
.../include_net_cfg80211.patch | 2 +-
.../0006-ieee802154-6lowpan-namespace.patch | 13 +---
.../network/0008-net-user-ns.patch | 4 +-
.../net_wireless_core.patch | 2 +-
.../net_mac80211_tx.patch | 4 +-
.../0014-netlink_seq/net_wireless_nl80211.patch | 2 +-
.../network/0021-umode_t-api-change/ath10k.patch | 14 ++++
.../network/0027-genl-const/nl80211.patch | 6 +-
.../0032-sriov_configure/igb_sriov_configure.patch | 8 +--
.../0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch | 8 +--
.../igb_ndo_set_vf_spoofchk.patch | 6 +-
.../network/0043-ndo_set_vf_rate/igb.patch | 8 +--
.../network/0047-write_iter/bluetooth.patch | 83 ++++++++++++++++++++++
.../network/0048-no_ndo_xmit_flush/igb.patch | 14 ++++
14 files changed, 137 insertions(+), 37 deletions(-)
create mode 100644 patches/collateral-evolutions/network/0021-umode_t-api-change/ath10k.patch
create mode 100644 patches/collateral-evolutions/network/0047-write_iter/bluetooth.patch
create mode 100644 patches/collateral-evolutions/network/0048-no_ndo_xmit_flush/igb.patch
--
1.9.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH 1/4] backports: adapt api change of rchan_callbacks->create_buf_file in ath10k
2014-09-06 23:23 [PATCH 0/4] backports: bring backports to next-20140905 Hauke Mehrtens
@ 2014-09-06 23:23 ` Hauke Mehrtens
2014-09-06 23:23 ` [PATCH 2/4] backports: bluetooth revert patch adding write_iter Hauke Mehrtens
` (2 subsequent siblings)
3 siblings, 0 replies; 5+ messages in thread
From: Hauke Mehrtens @ 2014-09-06 23:23 UTC (permalink / raw
To: backports; +Cc: Hauke Mehrtens
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
.../network/0021-umode_t-api-change/ath10k.patch | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 patches/collateral-evolutions/network/0021-umode_t-api-change/ath10k.patch
diff --git a/patches/collateral-evolutions/network/0021-umode_t-api-change/ath10k.patch b/patches/collateral-evolutions/network/0021-umode_t-api-change/ath10k.patch
new file mode 100644
index 0000000..09b82ed
--- /dev/null
+++ b/patches/collateral-evolutions/network/0021-umode_t-api-change/ath10k.patch
@@ -0,0 +1,14 @@
+--- a/drivers/net/wireless/ath/ath10k/spectral.c
++++ b/drivers/net/wireless/ath/ath10k/spectral.c
+@@ -482,7 +482,11 @@ static const struct file_operations fops
+
+ static struct dentry *create_buf_file_handler(const char *filename,
+ struct dentry *parent,
++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,3,0))
+ umode_t mode,
++#else
++ int mode,
++#endif
+ struct rchan_buf *buf,
+ int *is_global)
+ {
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/4] backports: bluetooth revert patch adding write_iter
2014-09-06 23:23 [PATCH 0/4] backports: bring backports to next-20140905 Hauke Mehrtens
2014-09-06 23:23 ` [PATCH 1/4] backports: adapt api change of rchan_callbacks->create_buf_file in ath10k Hauke Mehrtens
@ 2014-09-06 23:23 ` Hauke Mehrtens
2014-09-06 23:23 ` [PATCH 3/4] backports: remove usage of skbuff->xmit_more Hauke Mehrtens
2014-09-06 23:23 ` [PATCH 4/4] backports: refresh patches on next-20140905 Hauke Mehrtens
3 siblings, 0 replies; 5+ messages in thread
From: Hauke Mehrtens @ 2014-09-06 23:23 UTC (permalink / raw
To: backports; +Cc: Hauke Mehrtens
This reverts this upstream patch for older kernel versions:
commit 9f87eaae842575ec7de51654127a9bf4ad07ad6d
Author: Al Viro <viro@zeniv.linux.org.uk>
Date: Sat Aug 23 11:28:14 2014 -0400
switch hci_vhci to ->write_iter()
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
.../network/0047-write_iter/bluetooth.patch | 83 ++++++++++++++++++++++
1 file changed, 83 insertions(+)
create mode 100644 patches/collateral-evolutions/network/0047-write_iter/bluetooth.patch
diff --git a/patches/collateral-evolutions/network/0047-write_iter/bluetooth.patch b/patches/collateral-evolutions/network/0047-write_iter/bluetooth.patch
new file mode 100644
index 0000000..692b777
--- /dev/null
+++ b/patches/collateral-evolutions/network/0047-write_iter/bluetooth.patch
@@ -0,0 +1,83 @@
+--- a/drivers/bluetooth/hci_vhci.c
++++ b/drivers/bluetooth/hci_vhci.c
+@@ -159,6 +159,7 @@ static int vhci_create_device(struct vhc
+ return 0;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
+ static inline ssize_t vhci_get_user(struct vhci_data *data,
+ struct iov_iter *from)
+ {
+@@ -166,6 +167,17 @@ static inline ssize_t vhci_get_user(stru
+ struct sk_buff *skb;
+ __u8 pkt_type, opcode;
+ int ret;
++#else
++static inline ssize_t vhci_get_user(struct vhci_data *data,
++ const struct iovec *iov,
++ unsigned long count)
++{
++ size_t len = iov_length(iov, count);
++ struct sk_buff *skb;
++ __u8 pkt_type, opcode;
++ unsigned long i;
++ int ret;
++#endif
+
+ if (len < 2 || len > HCI_MAX_FRAME_SIZE)
+ return -EINVAL;
+@@ -174,10 +186,20 @@ static inline ssize_t vhci_get_user(stru
+ if (!skb)
+ return -ENOMEM;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
+ if (copy_from_iter(skb_put(skb, len), len, from) != len) {
+ kfree_skb(skb);
+ return -EFAULT;
+ }
++#else
++ for (i = 0; i < count; i++) {
++ if (copy_from_user(skb_put(skb, iov[i].iov_len),
++ iov[i].iov_base, iov[i].iov_len)) {
++ kfree_skb(skb);
++ return -EFAULT;
++ }
++ }
++#endif
+
+ pkt_type = *((__u8 *) skb->data);
+ skb_pull(skb, 1);
+@@ -289,12 +311,21 @@ static ssize_t vhci_read(struct file *fi
+ return ret;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
+ static ssize_t vhci_write(struct kiocb *iocb, struct iov_iter *from)
++#else
++static ssize_t vhci_write(struct kiocb *iocb, const struct iovec *iov,
++ unsigned long count, loff_t pos)
++#endif
+ {
+ struct file *file = iocb->ki_filp;
+ struct vhci_data *data = file->private_data;
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
+ return vhci_get_user(data, from);
++#else
++ return vhci_get_user(data, iov, count);
++#endif
+ }
+
+ static unsigned int vhci_poll(struct file *file, poll_table *wait)
+@@ -359,7 +390,11 @@ static int vhci_release(struct inode *in
+ static const struct file_operations vhci_fops = {
+ .owner = THIS_MODULE,
+ .read = vhci_read,
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
+ .write_iter = vhci_write,
++#else
++ .aio_write = vhci_write,
++#endif
+ .poll = vhci_poll,
+ .open = vhci_open,
+ .release = vhci_release,
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 3/4] backports: remove usage of skbuff->xmit_more
2014-09-06 23:23 [PATCH 0/4] backports: bring backports to next-20140905 Hauke Mehrtens
2014-09-06 23:23 ` [PATCH 1/4] backports: adapt api change of rchan_callbacks->create_buf_file in ath10k Hauke Mehrtens
2014-09-06 23:23 ` [PATCH 2/4] backports: bluetooth revert patch adding write_iter Hauke Mehrtens
@ 2014-09-06 23:23 ` Hauke Mehrtens
2014-09-06 23:23 ` [PATCH 4/4] backports: refresh patches on next-20140905 Hauke Mehrtens
3 siblings, 0 replies; 5+ messages in thread
From: Hauke Mehrtens @ 2014-09-06 23:23 UTC (permalink / raw
To: backports; +Cc: Hauke Mehrtens
This is a revet of these two upstream commits:
commit c1ebf46c1f72fe542853fc00f059a7d15259379d
Author: David S. Miller <davem@davemloft.net>
Date: Fri Aug 22 17:24:49 2014 -0700
igb: Support netdev_ops->ndo_xmit_flush()
commit 0b725a2ca61bedc33a2a63d0451d528b268cf975
Author: David S. Miller <davem@davemloft.net>
Date: Mon Aug 25 15:51:53 2014 -0700
net: Remove ndo_xmit_flush netdev operation, use signalling instead.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
.../network/0048-no_ndo_xmit_flush/igb.patch | 14 ++++++++++++++
1 file changed, 14 insertions(+)
create mode 100644 patches/collateral-evolutions/network/0048-no_ndo_xmit_flush/igb.patch
diff --git a/patches/collateral-evolutions/network/0048-no_ndo_xmit_flush/igb.patch b/patches/collateral-evolutions/network/0048-no_ndo_xmit_flush/igb.patch
new file mode 100644
index 0000000..f3ed217
--- /dev/null
+++ b/patches/collateral-evolutions/network/0048-no_ndo_xmit_flush/igb.patch
@@ -0,0 +1,14 @@
+--- a/drivers/net/ethernet/intel/igb/igb_main.c
++++ b/drivers/net/ethernet/intel/igb/igb_main.c
+@@ -4982,7 +4982,10 @@ static void igb_tx_map(struct igb_ring *
+ /* Make sure there is space in the ring for the next send. */
+ igb_maybe_stop_tx(tx_ring, DESC_NEEDED);
+
+- if (netif_xmit_stopped(txring_txq(tx_ring)) || !skb->xmit_more) {
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)
++ if (netif_xmit_stopped(txring_txq(tx_ring)) || !skb->xmit_more)
++#endif
++ {
+ writel(i, tx_ring->tail);
+
+ /* we need this if more than one processor can write to our tail
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 4/4] backports: refresh patches on next-20140905
2014-09-06 23:23 [PATCH 0/4] backports: bring backports to next-20140905 Hauke Mehrtens
` (2 preceding siblings ...)
2014-09-06 23:23 ` [PATCH 3/4] backports: remove usage of skbuff->xmit_more Hauke Mehrtens
@ 2014-09-06 23:23 ` Hauke Mehrtens
3 siblings, 0 replies; 5+ messages in thread
From: Hauke Mehrtens @ 2014-09-06 23:23 UTC (permalink / raw
To: backports; +Cc: Hauke Mehrtens
1 3.0.101 [ OK ]
2 3.1.10 [ OK ]
3 3.2.62 [ OK ]
4 3.3.8 [ OK ]
5 3.4.103 [ OK ]
6 3.5.7 [ OK ]
7 3.6.11 [ OK ]
8 3.7.10 [ OK ]
9 3.8.13 [ OK ]
10 3.9.11 [ OK ]
11 3.10.54 [ OK ]
12 3.11.10 [ OK ]
13 3.12.27 [ OK ]
14 3.13.11 [ OK ]
15 3.14.18 [ OK ]
16 3.15.10 [ OK ]
17 3.16.2 [ OK ]
18 3.17-rc3 [ OK ]
manual changes were done in:
patches/collateral-evolutions/network/0006-ieee802154-6lowpan-namespace.patch
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
.../0003-cfg80211-wext-padding/include_net_cfg80211.patch | 2 +-
.../network/0006-ieee802154-6lowpan-namespace.patch | 13 +------------
.../collateral-evolutions/network/0008-net-user-ns.patch | 4 ++--
.../net_wireless_core.patch | 2 +-
.../0011-mac80211-disable-tx-status/net_mac80211_tx.patch | 4 ++--
.../network/0014-netlink_seq/net_wireless_nl80211.patch | 2 +-
.../network/0027-genl-const/nl80211.patch | 6 +++---
.../network/0032-sriov_configure/igb_sriov_configure.patch | 8 ++++----
.../network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch | 8 ++++----
.../0034-ndo_set_vf_spoofchk/igb_ndo_set_vf_spoofchk.patch | 6 +++---
.../network/0043-ndo_set_vf_rate/igb.patch | 8 ++++----
11 files changed, 26 insertions(+), 37 deletions(-)
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 efcf56d..428e267 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
-@@ -2951,6 +2951,9 @@ struct wiphy_vendor_command {
+@@ -2953,6 +2953,9 @@ struct wiphy_vendor_command {
struct wiphy {
/* assign these fields before you register the wiphy */
diff --git a/patches/collateral-evolutions/network/0006-ieee802154-6lowpan-namespace.patch b/patches/collateral-evolutions/network/0006-ieee802154-6lowpan-namespace.patch
index 609bf20..bcf9544 100644
--- a/patches/collateral-evolutions/network/0006-ieee802154-6lowpan-namespace.patch
+++ b/patches/collateral-evolutions/network/0006-ieee802154-6lowpan-namespace.patch
@@ -16,7 +16,7 @@ idea yet.
spin_lock(&fq->q.lock);
-@@ -393,31 +397,55 @@ static int zero;
+@@ -393,24 +397,44 @@ static int zero;
static struct ctl_table lowpan_frags_ns_ctl_table[] = {
{
.procname = "6lowpanfrag_high_thresh",
@@ -61,14 +61,3 @@ idea yet.
.maxlen = sizeof(int),
.mode = 0644,
.proc_handler = proc_dointvec_jiffies,
- },
- {
- .procname = "6lowpanfrag_max_datagram_size",
-+#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,15,0))
- .data = &init_net.ieee802154_lowpan.max_dsize,
-+#else
-+ .data = &ieee802154_lowpan.max_dsize,
-+#endif
- .maxlen = sizeof(int),
- .mode = 0644,
- .proc_handler = proc_dointvec
diff --git a/patches/collateral-evolutions/network/0008-net-user-ns.patch b/patches/collateral-evolutions/network/0008-net-user-ns.patch
index d9cea85..02ae368 100644
--- a/patches/collateral-evolutions/network/0008-net-user-ns.patch
+++ b/patches/collateral-evolutions/network/0008-net-user-ns.patch
@@ -3,9 +3,9 @@ via commit 038e7332b8.
--- a/net/ieee802154/reassembly.c
+++ b/net/ieee802154/reassembly.c
-@@ -491,9 +491,11 @@ static int __net_init lowpan_frags_ns_sy
+@@ -479,9 +479,11 @@ static int __net_init lowpan_frags_ns_sy
+ table[1].extra2 = &ieee802154_lowpan->frags.high_thresh;
table[2].data = &ieee802154_lowpan->frags.timeout;
- table[3].data = &ieee802154_lowpan->max_dsize;
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,8,0)
/* Don't export sysctls to unprivileged users */
diff --git a/patches/collateral-evolutions/network/0010-add-wext-handlers-to-netdev/net_wireless_core.patch b/patches/collateral-evolutions/network/0010-add-wext-handlers-to-netdev/net_wireless_core.patch
index b7b93e4..f45685b 100644
--- a/patches/collateral-evolutions/network/0010-add-wext-handlers-to-netdev/net_wireless_core.patch
+++ b/patches/collateral-evolutions/network/0010-add-wext-handlers-to-netdev/net_wireless_core.patch
@@ -11,7 +11,7 @@
device_initialize(&rdev->wiphy.dev);
rdev->wiphy.dev.class = &ieee80211_class;
rdev->wiphy.dev.platform_data = rdev;
-@@ -925,6 +921,15 @@ static int cfg80211_netdev_notifier_call
+@@ -918,6 +914,15 @@ static int cfg80211_netdev_notifier_call
}
wdev->netdev = dev;
#ifdef CONFIG_CFG80211_WEXT
diff --git a/patches/collateral-evolutions/network/0011-mac80211-disable-tx-status/net_mac80211_tx.patch b/patches/collateral-evolutions/network/0011-mac80211-disable-tx-status/net_mac80211_tx.patch
index 05c4565..ed792ad 100644
--- a/patches/collateral-evolutions/network/0011-mac80211-disable-tx-status/net_mac80211_tx.patch
+++ b/patches/collateral-evolutions/network/0011-mac80211-disable-tx-status/net_mac80211_tx.patch
@@ -1,6 +1,6 @@
--- a/net/mac80211/tx.c
+++ b/net/mac80211/tx.c
-@@ -2067,6 +2067,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
+@@ -2070,6 +2070,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
goto fail_rcu;
}
@@ -8,7 +8,7 @@
if (unlikely(!multicast && skb->sk &&
skb_shinfo(skb)->tx_flags & SKBTX_WIFI_STATUS)) {
struct sk_buff *orig_skb = skb;
-@@ -2095,6 +2096,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
+@@ -2098,6 +2099,7 @@ netdev_tx_t ieee80211_subif_start_xmit(s
skb = orig_skb;
}
}
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 a995a7c..16f1cab 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
-@@ -6149,7 +6149,9 @@ static int nl80211_dump_scan(struct sk_b
+@@ -6157,7 +6157,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/0027-genl-const/nl80211.patch b/patches/collateral-evolutions/network/0027-genl-const/nl80211.patch
index 0565390..59dbd0c 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", },
-@@ -9372,7 +9372,7 @@ static int nl80211_set_qos_map(struct sk
+@@ -9380,7 +9380,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;
-@@ -9441,7 +9441,7 @@ static int nl80211_pre_doit(const struct
+@@ -9449,7 +9449,7 @@ static int nl80211_pre_doit(const struct
return 0;
}
@@ -39,7 +39,7 @@
struct genl_info *info)
{
if (info->user_ptr[1]) {
-@@ -9458,7 +9458,7 @@ static void nl80211_post_doit(const stru
+@@ -9466,7 +9466,7 @@ static void nl80211_post_doit(const stru
rtnl_unlock();
}
diff --git a/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch b/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch
index 49d894b..6d20e13 100644
--- a/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch
+++ b/patches/collateral-evolutions/network/0032-sriov_configure/igb_sriov_configure.patch
@@ -20,7 +20,7 @@
.err_handler = &igb_err_handler
};
-@@ -7639,6 +7643,7 @@ static int igb_sriov_reinit(struct pci_d
+@@ -7640,6 +7644,7 @@ static int igb_sriov_reinit(struct pci_d
return 0;
}
@@ -28,7 +28,7 @@
static int igb_pci_disable_sriov(struct pci_dev *dev)
{
int err = igb_disable_sriov(dev);
-@@ -7648,6 +7653,7 @@ static int igb_pci_disable_sriov(struct
+@@ -7649,6 +7654,7 @@ static int igb_pci_disable_sriov(struct
return err;
}
@@ -36,7 +36,7 @@
static int igb_pci_enable_sriov(struct pci_dev *dev, int num_vfs)
{
-@@ -7665,6 +7671,7 @@ out:
+@@ -7666,6 +7672,7 @@ out:
}
#endif
@@ -44,7 +44,7 @@
static int igb_pci_sriov_configure(struct pci_dev *dev, int num_vfs)
{
#ifdef CONFIG_PCI_IOV
-@@ -7675,6 +7682,7 @@ static int igb_pci_sriov_configure(struc
+@@ -7676,6 +7683,7 @@ static int igb_pci_sriov_configure(struc
#endif
return 0;
}
diff --git a/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch b/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch
index 8ef2e21..c203886 100644
--- a/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch
+++ b/patches/collateral-evolutions/network/0033-ndo_vlan_rx_vid/igb_ndo_vlan_rx_vid.patch
@@ -17,7 +17,7 @@
static void igb_restore_vlan(struct igb_adapter *);
static void igb_rar_set_qsel(struct igb_adapter *, u8 *, u32 , u8);
static void igb_ping_all_vfs(struct igb_adapter *);
-@@ -7307,8 +7315,14 @@ static void igb_vlan_mode(struct net_dev
+@@ -7308,8 +7316,14 @@ static void igb_vlan_mode(struct net_dev
igb_rlpml_set(adapter);
}
@@ -32,7 +32,7 @@
{
struct igb_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw;
-@@ -7322,11 +7336,19 @@ static int igb_vlan_rx_add_vid(struct ne
+@@ -7323,11 +7337,19 @@ static int igb_vlan_rx_add_vid(struct ne
set_bit(vid, adapter->active_vlans);
@@ -52,7 +52,7 @@
{
struct igb_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw;
-@@ -7342,7 +7364,9 @@ static int igb_vlan_rx_kill_vid(struct n
+@@ -7343,7 +7365,9 @@ static int igb_vlan_rx_kill_vid(struct n
clear_bit(vid, adapter->active_vlans);
@@ -62,7 +62,7 @@
}
static void igb_restore_vlan(struct igb_adapter *adapter)
-@@ -7352,7 +7376,11 @@ static void igb_restore_vlan(struct igb_
+@@ -7353,7 +7377,11 @@ static void igb_restore_vlan(struct igb_
igb_vlan_mode(adapter->netdev, adapter->netdev->features);
for_each_set_bit(vid, adapter->active_vlans, VLAN_N_VID)
diff --git a/patches/collateral-evolutions/network/0034-ndo_set_vf_spoofchk/igb_ndo_set_vf_spoofchk.patch b/patches/collateral-evolutions/network/0034-ndo_set_vf_spoofchk/igb_ndo_set_vf_spoofchk.patch
index 742e2bc..45adb7e 100644
--- a/patches/collateral-evolutions/network/0034-ndo_set_vf_spoofchk/igb_ndo_set_vf_spoofchk.patch
+++ b/patches/collateral-evolutions/network/0034-ndo_set_vf_spoofchk/igb_ndo_set_vf_spoofchk.patch
@@ -21,7 +21,7 @@
.ndo_get_vf_config = igb_ndo_get_vf_config,
#ifdef CONFIG_NET_POLL_CONTROLLER
.ndo_poll_controller = igb_netpoll,
-@@ -7990,6 +7994,7 @@ static int igb_ndo_set_vf_bw(struct net_
+@@ -7991,6 +7995,7 @@ static int igb_ndo_set_vf_bw(struct net_
return 0;
}
@@ -29,7 +29,7 @@
static int igb_ndo_set_vf_spoofchk(struct net_device *netdev, int vf,
bool setting)
{
-@@ -8016,6 +8021,7 @@ static int igb_ndo_set_vf_spoofchk(struc
+@@ -8017,6 +8022,7 @@ static int igb_ndo_set_vf_spoofchk(struc
adapter->vf_data[vf].spoofchk_enabled = setting;
return 0;
}
@@ -37,7 +37,7 @@
static int igb_ndo_get_vf_config(struct net_device *netdev,
int vf, struct ifla_vf_info *ivi)
-@@ -8029,7 +8035,9 @@ static int igb_ndo_get_vf_config(struct
+@@ -8030,7 +8036,9 @@ static int igb_ndo_get_vf_config(struct
ivi->min_tx_rate = 0;
ivi->vlan = adapter->vf_data[vf].pf_vlan;
ivi->qos = adapter->vf_data[vf].pf_qos;
diff --git a/patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb.patch b/patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb.patch
index ed1db41..c1786fc 100644
--- a/patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb.patch
+++ b/patches/collateral-evolutions/network/0043-ndo_set_vf_rate/igb.patch
@@ -24,7 +24,7 @@
#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0)
.ndo_set_vf_spoofchk = igb_ndo_set_vf_spoofchk,
#endif /* LINUX_VERSION_CODE >= KERNEL_VERSION(3,2,0) */
-@@ -7972,8 +7980,12 @@ static void igb_check_vf_rate_limit(stru
+@@ -7973,8 +7981,12 @@ static void igb_check_vf_rate_limit(stru
}
}
@@ -37,7 +37,7 @@
{
struct igb_adapter *adapter = netdev_priv(netdev);
struct e1000_hw *hw = &adapter->hw;
-@@ -7982,6 +7994,7 @@ static int igb_ndo_set_vf_bw(struct net_
+@@ -7983,6 +7995,7 @@ static int igb_ndo_set_vf_bw(struct net_
if (hw->mac.type != e1000_82576)
return -EOPNOTSUPP;
@@ -45,7 +45,7 @@
if (min_tx_rate)
return -EINVAL;
-@@ -7995,7 +8008,17 @@ static int igb_ndo_set_vf_bw(struct net_
+@@ -7996,7 +8009,17 @@ static int igb_ndo_set_vf_bw(struct net_
adapter->vf_rate_link_speed = actual_link_speed;
adapter->vf_data[vf].tx_rate = (u16)max_tx_rate;
igb_set_vf_rate_limit(hw, vf, max_tx_rate, actual_link_speed);
@@ -63,7 +63,7 @@
return 0;
}
-@@ -8036,8 +8059,12 @@ static int igb_ndo_get_vf_config(struct
+@@ -8037,8 +8060,12 @@ static int igb_ndo_get_vf_config(struct
return -EINVAL;
ivi->vf = vf;
memcpy(&ivi->mac, adapter->vf_data[vf].vf_mac_addresses, ETH_ALEN);
--
1.9.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2014-09-06 23:23 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-09-06 23:23 [PATCH 0/4] backports: bring backports to next-20140905 Hauke Mehrtens
2014-09-06 23:23 ` [PATCH 1/4] backports: adapt api change of rchan_callbacks->create_buf_file in ath10k Hauke Mehrtens
2014-09-06 23:23 ` [PATCH 2/4] backports: bluetooth revert patch adding write_iter Hauke Mehrtens
2014-09-06 23:23 ` [PATCH 3/4] backports: remove usage of skbuff->xmit_more Hauke Mehrtens
2014-09-06 23:23 ` [PATCH 4/4] backports: refresh patches on next-20140905 Hauke Mehrtens
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.