From: Greg Kroah-Hartman Date: Sun, 18 Mar 2018 16:38:19 +0000 (+0100) Subject: 4.9-stable patches X-Git-Tag: v4.14.28~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2349529a876f6c2de46b1464f278c471c0414dcf;p=thirdparty%2Fkernel%2Fstable-queue.git 4.9-stable patches added patches: net-hns-some-checkpatch.pl-script-warning-fixes.patch --- diff --git a/queue-4.9/net-hns-some-checkpatch.pl-script-warning-fixes.patch b/queue-4.9/net-hns-some-checkpatch.pl-script-warning-fixes.patch new file mode 100644 index 00000000000..474d2982a30 --- /dev/null +++ b/queue-4.9/net-hns-some-checkpatch.pl-script-warning-fixes.patch @@ -0,0 +1,101 @@ +From b4957ab0826f6f7efdfdc648521e1c4c3fc6ceda Mon Sep 17 00:00:00 2001 +From: Salil +Date: Sat, 1 Apr 2017 12:03:48 +0100 +Subject: net: hns: Some checkpatch.pl script & warning fixes + +From: Salil + +commit b4957ab0826f6f7efdfdc648521e1c4c3fc6ceda upstream. + +This patch fixes some checkpatch.pl script caught errors and +warnings during the compilation time. + +[ backported to 4.9.y to fix build warnings caused by the backporting of + 64ec10dc2ab8 ("net: hns: Correct HNS RSS key set function") by Sasha + - gregkh] + +Signed-off-by: Salil Mehta +Signed-off-by: David S. Miller +Cc: Sasha Levin +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c | 11 +++++------ + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c | 1 - + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 5 +++-- + drivers/net/ethernet/hisilicon/hns/hns_ethtool.c | 1 - + 5 files changed, 9 insertions(+), 11 deletions(-) + +--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c ++++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_gmac.c +@@ -86,12 +86,11 @@ static void hns_gmac_disable(void *mac_d + dsaf_set_dev_bit(drv, GMAC_PORT_EN_REG, GMAC_PORT_RX_EN_B, 0); + } + +-/** +-*hns_gmac_get_en - get port enable +-*@mac_drv:mac device +-*@rx:rx enable +-*@tx:tx enable +-*/ ++/* hns_gmac_get_en - get port enable ++ * @mac_drv:mac device ++ * @rx:rx enable ++ * @tx:tx enable ++ */ + static void hns_gmac_get_en(void *mac_drv, u32 *rx, u32 *tx) + { + struct mac_driver *drv = (struct mac_driver *)mac_drv; +--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h ++++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.h +@@ -70,7 +70,7 @@ enum dsaf_roce_qos_sl { + }; + + #define DSAF_STATS_READ(p, offset) (*((u64 *)((u8 *)(p) + (offset)))) +-#define HNS_DSAF_IS_DEBUG(dev) (dev->dsaf_mode == DSAF_MODE_DISABLE_SP) ++#define HNS_DSAF_IS_DEBUG(dev) ((dev)->dsaf_mode == DSAF_MODE_DISABLE_SP) + + enum hal_dsaf_mode { + HRD_DSAF_NO_DSAF_MODE = 0x0, +--- a/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c ++++ b/drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.c +@@ -430,7 +430,6 @@ static void hns_rcb_ring_pair_get_cfg(st + static int hns_rcb_get_port_in_comm( + struct rcb_common_cb *rcb_common, int ring_idx) + { +- + return ring_idx / (rcb_common->max_q_per_vf * rcb_common->max_vfn); + } + +--- a/drivers/net/ethernet/hisilicon/hns/hns_enet.c ++++ b/drivers/net/ethernet/hisilicon/hns/hns_enet.c +@@ -511,7 +511,8 @@ static void hns_nic_reuse_page(struct sk + int last_offset; + bool twobufs; + +- twobufs = ((PAGE_SIZE < 8192) && hnae_buf_size(ring) == HNS_BUFFER_SIZE_2048); ++ twobufs = ((PAGE_SIZE < 8192) && ++ hnae_buf_size(ring) == HNS_BUFFER_SIZE_2048); + + desc = &ring->desc[ring->next_to_clean]; + size = le16_to_cpu(desc->rx.size); +@@ -1700,7 +1701,7 @@ static void hns_nic_reset_subtask(struct + static void hns_nic_service_event_complete(struct hns_nic_priv *priv) + { + WARN_ON(!test_bit(NIC_STATE_SERVICE_SCHED, &priv->state)); +- ++ /* make sure to commit the things */ + smp_mb__before_atomic(); + clear_bit(NIC_STATE_SERVICE_SCHED, &priv->state); + } +--- a/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c ++++ b/drivers/net/ethernet/hisilicon/hns/hns_ethtool.c +@@ -1243,7 +1243,6 @@ hns_set_rss(struct net_device *netdev, c + { + struct hns_nic_priv *priv = netdev_priv(netdev); + struct hnae_ae_ops *ops; +- int ret; + + if (AE_IS_VER1(priv->enet_ver)) { + netdev_err(netdev, diff --git a/queue-4.9/series b/queue-4.9/series index 1bd94ef9a81..b68e1673f77 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -208,3 +208,4 @@ ipvlan-add-l2-check-for-packets-arriving-via-virtual-devices.patch rcutorture-configinit-fix-build-directory-error-message.patch locking-locktorture-fix-num-reader-writer-corner-cases.patch ima-relax-requiring-a-file-signature-for-new-files-with-zero-length.patch +net-hns-some-checkpatch.pl-script-warning-fixes.patch