History

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

Pull to get the thermal netlink multicast group name fix, otherwise the assertion added in net-next to netlink to detect that kind of bug makes systems unbootable for some folks.

David S. Miller committed 13 years ago

Commit ea3d1cc2 parents 2fa70df f4541d622 files · +133 −72Browse files

Unified · Split

22 files
  1. drivers/bluetooth/ath3k.c +4 −0
  2. drivers/bluetooth/btusb.c +2 −0
  3. drivers/net/ethernet/freescale/fec_ptp.c +3 −0
  4. drivers/net/ethernet/lantiq_etop.c +1 −1
  5. drivers/net/ethernet/mellanox/mlx4/en_netdev.c +11 −11
  6. drivers/net/ethernet/mellanox/mlx4/eq.c +1 −1
  7. drivers/net/ethernet/mellanox/mlx4/resource_tracker.c +35 −10
  8. drivers/net/ethernet/ti/cpsw.c +1 −1
  9. drivers/net/wireless/ath/ath9k/ar9003_calib.c +4 −0
  10. drivers/net/wireless/ath/ath9k/link.c +13 −13
  11. drivers/net/wireless/iwlegacy/3945-mac.c +12 −10
  12. drivers/net/wireless/mwifiex/cmdevt.c +16 −6
  13. drivers/net/wireless/mwifiex/init.c +8 −0
  14. drivers/net/wireless/mwifiex/main.h +2 −2
  15. drivers/net/wireless/mwifiex/scan.c +4 −4
  16. drivers/net/wireless/mwifiex/sta_ioctl.c +2 −8
  17. drivers/net/wireless/rtlwifi/usb.c +1 −0
  18. include/linux/thermal.h +1 −1
  19. include/uapi/linux/packet_diag.h +3 −1
  20. include/uapi/linux/unix_diag.h +3 −1
  21. net/bluetooth/sco.c +1 −0
  22. net/ipv4/tcp_output.c +5 −2
drivers/bluetooth/ath3k.c+4−0
@@ -73,9 +73,11 @@ static struct usb_device_id ath3k_table[] = { · 72 unmodified lines
7373 { USB_DEVICE(0x03F0, 0x311D) },
7474
7575 /* Atheros AR3012 with sflash firmware*/
76+ { USB_DEVICE(0x0CF3, 0x0036) },
7677 { USB_DEVICE(0x0CF3, 0x3004) },
7778 { USB_DEVICE(0x0CF3, 0x3008) },
7879 { USB_DEVICE(0x0CF3, 0x311D) },
80+ { USB_DEVICE(0x0CF3, 0x817a) },
7981 { USB_DEVICE(0x13d3, 0x3375) },
8082 { USB_DEVICE(0x04CA, 0x3004) },
8183 { USB_DEVICE(0x04CA, 0x3005) },
@@ -107,9 +109,11 @@ MODULE_DEVICE_TABLE(usb, ath3k_table); · 25 unmodified lines
107109 static struct usb_device_id ath3k_blist_tbl[] = {
108110
109111 /* Atheros AR3012 with sflash firmware*/
112+ { USB_DEVICE(0x0CF3, 0x0036), .driver_info = BTUSB_ATH3012 },
110113 { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
111114 { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },
112115 { USB_DEVICE(0x0cf3, 0x311D), .driver_info = BTUSB_ATH3012 },
116+ { USB_DEVICE(0x0CF3, 0x817a), .driver_info = BTUSB_ATH3012 },
113117 { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
114118 { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
115119 { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
drivers/bluetooth/btusb.c+2−0
@@ -131,9 +131,11 @@ static struct usb_device_id blacklist_table[] = { · 130 unmodified lines
131131 { USB_DEVICE(0x03f0, 0x311d), .driver_info = BTUSB_IGNORE },
132132
133133 /* Atheros 3012 with sflash firmware */
134+ { USB_DEVICE(0x0cf3, 0x0036), .driver_info = BTUSB_ATH3012 },
134135 { USB_DEVICE(0x0cf3, 0x3004), .driver_info = BTUSB_ATH3012 },
135136 { USB_DEVICE(0x0cf3, 0x3008), .driver_info = BTUSB_ATH3012 },
136137 { USB_DEVICE(0x0cf3, 0x311d), .driver_info = BTUSB_ATH3012 },
138+ { USB_DEVICE(0x0cf3, 0x817a), .driver_info = BTUSB_ATH3012 },
137139 { USB_DEVICE(0x13d3, 0x3375), .driver_info = BTUSB_ATH3012 },
138140 { USB_DEVICE(0x04ca, 0x3004), .driver_info = BTUSB_ATH3012 },
139141 { USB_DEVICE(0x04ca, 0x3005), .driver_info = BTUSB_ATH3012 },
drivers/net/ethernet/freescale/fec_ptp.c+3−0
@@ -128,6 +128,7 @@ void fec_ptp_start_cyclecounter(struct net_device *ndev) · 127 unmodified lines
128128
129129 spin_unlock_irqrestore(&fep->tmreg_lock, flags);
130130 }
131+EXPORT_SYMBOL(fec_ptp_start_cyclecounter);
131132
132133 /**
133134 * fec_ptp_adjfreq - adjust ptp cycle frequency
@@ -318,6 +319,7 @@ int fec_ptp_ioctl(struct net_device *ndev, struct ifreq *ifr, int cmd) · 184 unmodified lines
318319 return copy_to_user(ifr->ifr_data, &config, sizeof(config)) ?
319320 -EFAULT : 0;
320321 }
322+EXPORT_SYMBOL(fec_ptp_ioctl);
321323
322324 /**
323325 * fec_time_keep - call timecounter_read every second to avoid timer overrun
@@ -383,3 +385,4 @@ void fec_ptp_init(struct net_device *ndev, struct platform_device *pdev) · 59 unmodified lines
383385 pr_info("registered PHC device on %s\n", ndev->name);
384386 }
385387 }
388+EXPORT_SYMBOL(fec_ptp_init);
drivers/net/ethernet/lantiq_etop.c+1−1
@@ -769,7 +769,7 @@ ltq_etop_probe(struct platform_device *pdev) · 768 unmodified lines
769769 return 0;
770770
771771 err_free:
772− kfree(dev);
772+ free_netdev(dev);
773773 err_out:
774774 return err;
775775 }
drivers/net/ethernet/mellanox/mlx4/en_netdev.c+11−11
@@ -1637,6 +1637,17 @@ void mlx4_en_stop_port(struct net_device *dev, int detach) · 1636 unmodified lines
16371637 /* Flush multicast filter */
16381638 mlx4_SET_MCAST_FLTR(mdev->dev, priv->port, 0, 1, MLX4_MCAST_CONFIG);
16391639
1640+ /* Remove flow steering rules for the port*/
1641+ if (mdev->dev->caps.steering_mode ==
1642+ MLX4_STEERING_MODE_DEVICE_MANAGED) {
1643+ ASSERT_RTNL();
1644+ list_for_each_entry_safe(flow, tmp_flow,
1645+ &priv->ethtool_list, list) {
1646+ mlx4_flow_detach(mdev->dev, flow->id);
1647+ list_del(&flow->list);
1648+ }
1649+ }
1650+
16401651 mlx4_en_destroy_drop_qp(priv);
16411652
16421653 /* Free TX Rings */
@@ -1657,17 +1668,6 @@ void mlx4_en_stop_port(struct net_device *dev, int detach) · 14 unmodified lines
16571668 if (!(mdev->dev->caps.flags2 & MLX4_DEV_CAP_FLAGS2_REASSIGN_MAC_EN))
16581669 mdev->mac_removed[priv->port] = 1;
16591670
1660− /* Remove flow steering rules for the port*/
1661− if (mdev->dev->caps.steering_mode ==
1662− MLX4_STEERING_MODE_DEVICE_MANAGED) {
1663− ASSERT_RTNL();
1664− list_for_each_entry_safe(flow, tmp_flow,
1665− &priv->ethtool_list, list) {
1666− mlx4_flow_detach(mdev->dev, flow->id);
1667− list_del(&flow->list);
1668− }
1669− }
1670−
16711671 /* Free RX Rings */
16721672 for (i = 0; i < priv->rx_ring_num; i++) {
16731673 mlx4_en_deactivate_rx_ring(priv, &priv->rx_ring[i]);
drivers/net/ethernet/mellanox/mlx4/eq.c+1−1
@@ -771,7 +771,7 @@ int mlx4_MAP_EQ_wrapper(struct mlx4_dev *dev, int slave, · 770 unmodified lines
771771 struct mlx4_slave_event_eq_info *event_eq =
772772 priv->mfunc.master.slave_state[slave].event_eq;
773773 u32 in_modifier = vhcr->in_modifier;
774− u32 eqn = in_modifier & 0x1FF;
774+ u32 eqn = in_modifier & 0x3FF;
775775 u64 in_param = vhcr->in_param;
776776 int err = 0;
777777 int i;
drivers/net/ethernet/mellanox/mlx4/resource_tracker.c+35−10
@@ -99,6 +99,7 @@ struct res_qp { · 98 unmodified lines
9999 struct list_head mcg_list;
100100 spinlock_t mcg_spl;
101101 int local_qpn;
102+ atomic_t ref_count;
102103 };
103104
104105 enum res_mtt_states {
@@ -197,6 +198,7 @@ enum res_fs_rule_states { · 92 unmodified lines
197198
198199 struct res_fs_rule {
199200 struct res_common com;
201+ int qpn;
200202 };
201203
202204 static void *res_tracker_lookup(struct rb_root *root, u64 res_id)
@@ -355,7 +357,7 @@ static int mpt_mask(struct mlx4_dev *dev) · 152 unmodified lines
355357 return dev->caps.num_mpts - 1;
356358 }
357359
358−static void *find_res(struct mlx4_dev *dev, int res_id,
360+static void *find_res(struct mlx4_dev *dev, u64 res_id,
359361 enum mlx4_resource type)
360362 {
361363 struct mlx4_priv *priv = mlx4_priv(dev);
@@ -447,6 +449,7 @@ static struct res_common *alloc_qp_tr(int id) · 85 unmodified lines
447449 ret->local_qpn = id;
448450 INIT_LIST_HEAD(&ret->mcg_list);
449451 spin_lock_init(&ret->mcg_spl);
452+ atomic_set(&ret->ref_count, 0);
450453
451454 return &ret->com;
452455 }
@@ -554,7 +557,7 @@ static struct res_common *alloc_xrcdn_tr(int id) · 101 unmodified lines
554557 return &ret->com;
555558 }
556559
557−static struct res_common *alloc_fs_rule_tr(u64 id)
560+static struct res_common *alloc_fs_rule_tr(u64 id, int qpn)
558561 {
559562 struct res_fs_rule *ret;
560563
@@ -564,7 +567,7 @@ static struct res_common *alloc_fs_rule_tr(u64 id) · 3 unmodified lines
564567
565568 ret->com.res_id = id;
566569 ret->com.state = RES_FS_RULE_ALLOCATED;
567−
570+ ret->qpn = qpn;
568571 return &ret->com;
569572 }
570573
@@ -602,7 +605,7 @@ static struct res_common *alloc_tr(u64 id, enum mlx4_resource type, int slave, · 31 unmodified lines
602605 ret = alloc_xrcdn_tr(id);
603606 break;
604607 case RES_FS_RULE:
605− ret = alloc_fs_rule_tr(id);
608+ ret = alloc_fs_rule_tr(id, extra);
606609 break;
607610 default:
608611 return NULL;
@@ -671,10 +674,14 @@ undo: · 62 unmodified lines
671674
672675 static int remove_qp_ok(struct res_qp *res)
673676 {
674− if (res->com.state == RES_QP_BUSY)
677+ if (res->com.state == RES_QP_BUSY || atomic_read(&res->ref_count) ||
678+ !list_empty(&res->mcg_list)) {
679+ pr_err("resource tracker: fail to remove qp, state %d, ref_count %d\n",
680+ res->com.state, atomic_read(&res->ref_count));
675681 return -EBUSY;
676− else if (res->com.state != RES_QP_RESERVED)
682+ } else if (res->com.state != RES_QP_RESERVED) {
677683 return -EPERM;
684+ }
678685
679686 return 0;
680687 }
@@ -3124,6 +3131,7 @@ int mlx4_QP_FLOW_STEERING_ATTACH_wrapper(struct mlx4_dev *dev, int slave, · 2443 unmodified lines
31243131 struct list_head *rlist = &tracker->slave_list[slave].res_list[RES_MAC];
31253132 int err;
31263133 int qpn;
3134+ struct res_qp *rqp;
31273135 struct mlx4_net_trans_rule_hw_ctrl *ctrl;
31283136 struct _rule_hw *rule_header;
31293137 int header_id;
@@ -3134,7 +3142,7 @@ int mlx4_QP_FLOW_STEERING_ATTACH_wrapper(struct mlx4_dev *dev, int slave, · 4 unmodified lines
31343142
31353143 ctrl = (struct mlx4_net_trans_rule_hw_ctrl *)inbox->buf;
31363144 qpn = be32_to_cpu(ctrl->qpn) & 0xffffff;
3137− err = get_res(dev, slave, qpn, RES_QP, NULL);
3145+ err = get_res(dev, slave, qpn, RES_QP, &rqp);
31383146 if (err) {
31393147 pr_err("Steering rule with qpn 0x%x rejected.\n", qpn);
31403148 return err;
@@ -3175,14 +3183,16 @@ int mlx4_QP_FLOW_STEERING_ATTACH_wrapper(struct mlx4_dev *dev, int slave, · 34 unmodified lines
31753183 if (err)
31763184 goto err_put;
31773185
3178− err = add_res_range(dev, slave, vhcr->out_param, 1, RES_FS_RULE, 0);
3186+ err = add_res_range(dev, slave, vhcr->out_param, 1, RES_FS_RULE, qpn);
31793187 if (err) {
31803188 mlx4_err(dev, "Fail to add flow steering resources.\n ");
31813189 /* detach rule*/
31823190 mlx4_cmd(dev, vhcr->out_param, 0, 0,
31833191 MLX4_QP_FLOW_STEERING_DETACH, MLX4_CMD_TIME_CLASS_A,
31843192 MLX4_CMD_NATIVE);
3193+ goto err_put;
31853194 }
3195+ atomic_inc(&rqp->ref_count);
31863196 err_put:
31873197 put_res(dev, slave, qpn, RES_QP);
31883198 return err;
@@ -3195,20 +3205,35 @@ int mlx4_QP_FLOW_STEERING_DETACH_wrapper(struct mlx4_dev *dev, int slave, · 6 unmodified lines
31953205 struct mlx4_cmd_info *cmd)
31963206 {
31973207 int err;
3208+ struct res_qp *rqp;
3209+ struct res_fs_rule *rrule;
31983210
31993211 if (dev->caps.steering_mode !=
32003212 MLX4_STEERING_MODE_DEVICE_MANAGED)
32013213 return -EOPNOTSUPP;
32023214
3215+ err = get_res(dev, slave, vhcr->in_param, RES_FS_RULE, &rrule);
3216+ if (err)
3217+ return err;
3218+ /* Release the rule form busy state before removal */
3219+ put_res(dev, slave, vhcr->in_param, RES_FS_RULE);
3220+ err = get_res(dev, slave, rrule->qpn, RES_QP, &rqp);
3221+ if (err)
3222+ return err;
3223+
32033224 err = rem_res_range(dev, slave, vhcr->in_param, 1, RES_FS_RULE, 0);
32043225 if (err) {
32053226 mlx4_err(dev, "Fail to remove flow steering resources.\n ");
3206− return err;
3227+ goto out;
32073228 }
32083229
32093230 err = mlx4_cmd(dev, vhcr->in_param, 0, 0,
32103231 MLX4_QP_FLOW_STEERING_DETACH, MLX4_CMD_TIME_CLASS_A,
32113232 MLX4_CMD_NATIVE);
3233+ if (!err)
3234+ atomic_dec(&rqp->ref_count);
3235+out:
3236+ put_res(dev, slave, rrule->qpn, RES_QP);
32123237 return err;
32133238 }
32143239
@@ -3806,6 +3831,7 @@ void mlx4_delete_all_resources_for_slave(struct mlx4_dev *dev, int slave) · 591 unmodified lines
38063831 mutex_lock(&priv->mfunc.master.res_tracker.slave_list[slave].mutex);
38073832 /*VLAN*/
38083833 rem_slave_macs(dev, slave);
3834+ rem_slave_fs_rule(dev, slave);
38093835 rem_slave_qps(dev, slave);
38103836 rem_slave_srqs(dev, slave);
38113837 rem_slave_cqs(dev, slave);
@@ -3814,6 +3840,5 @@ void mlx4_delete_all_resources_for_slave(struct mlx4_dev *dev, int slave) · 2 unmodified lines
38143840 rem_slave_mtts(dev, slave);
38153841 rem_slave_counters(dev, slave);
38163842 rem_slave_xrcdns(dev, slave);
3817− rem_slave_fs_rule(dev, slave);
38183843 mutex_unlock(&priv->mfunc.master.res_tracker.slave_list[slave].mutex);
38193844 }
drivers/net/ethernet/ti/cpsw.c+1−1
@@ -1504,7 +1504,7 @@ static int cpsw_probe_dt(struct cpsw_platform_data *data, · 1503 unmodified lines
15041504 struct platform_device *mdio;
15051505
15061506 parp = of_get_property(slave_node, "phy_id", &lenp);
1507− if ((parp == NULL) && (lenp != (sizeof(void *) * 2))) {
1507+ if ((parp == NULL) || (lenp != (sizeof(void *) * 2))) {
15081508 pr_err("Missing slave[%d] phy_id property\n", i);
15091509 ret = -EINVAL;
15101510 goto error_ret;
drivers/net/wireless/ath/ath9k/ar9003_calib.c+4−0
@@ -1023,6 +1023,7 @@ static bool ar9003_hw_init_cal(struct ath_hw *ah, · 1022 unmodified lines
10231023 AR_PHY_AGC_CONTROL_FLTR_CAL |
10241024 AR_PHY_AGC_CONTROL_PKDET_CAL;
10251025
1026+ /* Use chip chainmask only for calibration */
10261027 ar9003_hw_set_chain_masks(ah, ah->caps.rx_chainmask, ah->caps.tx_chainmask);
10271028
10281029 if (rtt) {
@@ -1150,6 +1151,9 @@ skip_tx_iqcal: · 121 unmodified lines
11501151 ar9003_hw_rtt_disable(ah);
11511152 }
11521153
1154+ /* Revert chainmask to runtime parameters */
1155+ ar9003_hw_set_chain_masks(ah, ah->rxchainmask, ah->txchainmask);
1156+
11531157 /* Initialize list pointers */
11541158 ah->cal_list = ah->cal_list_last = ah->cal_list_curr = NULL;
11551159
drivers/net/wireless/ath/ath9k/link.c+13−13
@@ -28,21 +28,21 @@ void ath_tx_complete_poll_work(struct work_struct *work) · 27 unmodified lines
2828 int i;
2929 bool needreset = false;
3030
31− for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++)
32− if (ATH_TXQ_SETUP(sc, i)) {
33− txq = &sc->tx.txq[i];
34− ath_txq_lock(sc, txq);
35− if (txq->axq_depth) {
36− if (txq->axq_tx_inprogress) {
37− needreset = true;
38− ath_txq_unlock(sc, txq);
39− break;
40− } else {
41− txq->axq_tx_inprogress = true;
42− }
31+ for (i = 0; i < IEEE80211_NUM_ACS; i++) {
32+ txq = sc->tx.txq_map[i];
33+
34+ ath_txq_lock(sc, txq);
35+ if (txq->axq_depth) {
36+ if (txq->axq_tx_inprogress) {
37+ needreset = true;
38+ ath_txq_unlock(sc, txq);
39+ break;
40+ } else {
41+ txq->axq_tx_inprogress = true;
4342 }
44− ath_txq_unlock_complete(sc, txq);
4543 }
44+ ath_txq_unlock_complete(sc, txq);
45+ }
4646
4747 if (needreset) {
4848 ath_dbg(ath9k_hw_common(sc->sc_ah), RESET,
drivers/net/wireless/iwlegacy/3945-mac.c+12−10
@@ -475,6 +475,7 @@ il3945_tx_skb(struct il_priv *il, · 474 unmodified lines
475475 dma_addr_t txcmd_phys;
476476 int txq_id = skb_get_queue_mapping(skb);
477477 u16 len, idx, hdr_len;
478+ u16 firstlen, secondlen;
478479 u8 id;
479480 u8 unicast;
480481 u8 sta_id;
@@ -589,21 +590,22 @@ il3945_tx_skb(struct il_priv *il, · 108 unmodified lines
589590 len =
590591 sizeof(struct il3945_tx_cmd) + sizeof(struct il_cmd_header) +
591592 hdr_len;
592− len = (len + 3) & ~3;
593+ firstlen = (len + 3) & ~3;
593594
594595 /* Physical address of this Tx command's header (not MAC header!),
595596 * within command buffer array. */
596597 txcmd_phys =
597− pci_map_single(il->pci_dev, &out_cmd->hdr, len, PCI_DMA_TODEVICE);
598+ pci_map_single(il->pci_dev, &out_cmd->hdr, firstlen,
599+ PCI_DMA_TODEVICE);
598600 if (unlikely(pci_dma_mapping_error(il->pci_dev, txcmd_phys)))
599601 goto drop_unlock;
600602
601603 /* Set up TFD's 2nd entry to point directly to remainder of skb,
602604 * if any (802.11 null frames have no payload). */
603− len = skb->len - hdr_len;
604− if (len) {
605+ secondlen = skb->len - hdr_len;
606+ if (secondlen > 0) {
605607 phys_addr =
606− pci_map_single(il->pci_dev, skb->data + hdr_len, len,
608+ pci_map_single(il->pci_dev, skb->data + hdr_len, secondlen,
607609 PCI_DMA_TODEVICE);
608610 if (unlikely(pci_dma_mapping_error(il->pci_dev, phys_addr)))
609611 goto drop_unlock;
@@ -611,12 +613,12 @@ il3945_tx_skb(struct il_priv *il, · 1 unmodified line
611613
612614 /* Add buffer containing Tx command and MAC(!) header to TFD's
613615 * first entry */
614− il->ops->txq_attach_buf_to_tfd(il, txq, txcmd_phys, len, 1, 0);
616+ il->ops->txq_attach_buf_to_tfd(il, txq, txcmd_phys, firstlen, 1, 0);
615617 dma_unmap_addr_set(out_meta, mapping, txcmd_phys);
616− dma_unmap_len_set(out_meta, len, len);
617− if (len)
618− il->ops->txq_attach_buf_to_tfd(il, txq, phys_addr, len, 0,
619− U32_PAD(len));
618+ dma_unmap_len_set(out_meta, len, firstlen);
619+ if (secondlen > 0)
620+ il->ops->txq_attach_buf_to_tfd(il, txq, phys_addr, secondlen, 0,
621+ U32_PAD(secondlen));
620622
621623 if (!ieee80211_has_morefrags(hdr->frame_control)) {
622624 txq->need_update = 1;
drivers/net/wireless/mwifiex/cmdevt.c+16−6
@@ -157,6 +157,20 @@ static int mwifiex_dnld_cmd_to_fw(struct mwifiex_private *priv, · 156 unmodified lines
157157 return -1;
158158 }
159159
160+ cmd_code = le16_to_cpu(host_cmd->command);
161+ cmd_size = le16_to_cpu(host_cmd->size);
162+
163+ if (adapter->hw_status == MWIFIEX_HW_STATUS_RESET &&
164+ cmd_code != HostCmd_CMD_FUNC_SHUTDOWN &&
165+ cmd_code != HostCmd_CMD_FUNC_INIT) {
166+ dev_err(adapter->dev,
167+ "DNLD_CMD: FW in reset state, ignore cmd %#x\n",
168+ cmd_code);
169+ mwifiex_complete_cmd(adapter, cmd_node);
170+ mwifiex_insert_cmd_to_free_q(adapter, cmd_node);
171+ return -1;
172+ }
173+
160174 /* Set command sequence number */
161175 adapter->seq_num++;
162176 host_cmd->seq_num = cpu_to_le16(HostCmd_SET_SEQ_NO_BSS_INFO
@@ -168,9 +182,6 @@ static int mwifiex_dnld_cmd_to_fw(struct mwifiex_private *priv, · 5 unmodified lines
168182 adapter->curr_cmd = cmd_node;
169183 spin_unlock_irqrestore(&adapter->mwifiex_cmd_lock, flags);
170184
171− cmd_code = le16_to_cpu(host_cmd->command);
172− cmd_size = le16_to_cpu(host_cmd->size);
173−
174185 /* Adjust skb length */
175186 if (cmd_node->cmd_skb->len > cmd_size)
176187 /*
@@ -484,8 +495,6 @@ int mwifiex_send_cmd_sync(struct mwifiex_private *priv, uint16_t cmd_no, · 307 unmodified lines
484495
485496 ret = mwifiex_send_cmd_async(priv, cmd_no, cmd_action, cmd_oid,
486497 data_buf);
487− if (!ret)
488− ret = mwifiex_wait_queue_complete(adapter);
489498
490499 return ret;
491500 }
@@ -588,9 +597,10 @@ int mwifiex_send_cmd_async(struct mwifiex_private *priv, uint16_t cmd_no, · 96 unmodified lines
588597 if (cmd_no == HostCmd_CMD_802_11_SCAN) {
589598 mwifiex_queue_scan_cmd(priv, cmd_node);
590599 } else {
591− adapter->cmd_queued = cmd_node;
592600 mwifiex_insert_cmd_to_pending_q(adapter, cmd_node, true);
593601 queue_work(adapter->workqueue, &adapter->main_work);
602+ if (cmd_node->wait_q_enabled)
603+ ret = mwifiex_wait_queue_complete(adapter, cmd_node);
594604 }
595605
596606 return ret;
drivers/net/wireless/mwifiex/init.c+8−0
@@ -709,6 +709,14 @@ mwifiex_shutdown_drv(struct mwifiex_adapter *adapter) · 708 unmodified lines
709709 return ret;
710710 }
711711
712+ /* cancel current command */
713+ if (adapter->curr_cmd) {
714+ dev_warn(adapter->dev, "curr_cmd is still in processing\n");
715+ del_timer(&adapter->cmd_timer);
716+ mwifiex_insert_cmd_to_free_q(adapter, adapter->curr_cmd);
717+ adapter->curr_cmd = NULL;
718+ }
719+
712720 /* shut down mwifiex */
713721 dev_dbg(adapter->dev, "info: shutdown mwifiex...\n");
714722
drivers/net/wireless/mwifiex/main.h+2−2
@@ -728,7 +728,6 @@ struct mwifiex_adapter { · 727 unmodified lines
728728 u16 cmd_wait_q_required;
729729 struct mwifiex_wait_queue cmd_wait_q;
730730 u8 scan_wait_q_woken;
731− struct cmd_ctrl_node *cmd_queued;
732731 spinlock_t queue_lock; /* lock for tx queues */
733732 struct completion fw_load;
734733 u8 country_code[IEEE80211_COUNTRY_STRING_LEN];
@@ -1023,7 +1022,8 @@ int mwifiex_request_set_multicast_list(struct mwifiex_private *priv, · 288 unmodified lines
10231022 struct mwifiex_multicast_list *mcast_list);
10241023 int mwifiex_copy_mcast_addr(struct mwifiex_multicast_list *mlist,
10251024 struct net_device *dev);
1026−int mwifiex_wait_queue_complete(struct mwifiex_adapter *adapter);
1025+int mwifiex_wait_queue_complete(struct mwifiex_adapter *adapter,
1026+ struct cmd_ctrl_node *cmd_queued);
10271027 int mwifiex_bss_start(struct mwifiex_private *priv, struct cfg80211_bss *bss,
10281028 struct cfg80211_ssid *req_ssid);
10291029 int mwifiex_cancel_hs(struct mwifiex_private *priv, int cmd_type);
drivers/net/wireless/mwifiex/scan.c+4−4
@@ -1388,10 +1388,13 @@ int mwifiex_scan_networks(struct mwifiex_private *priv, · 1387 unmodified lines
13881388 list_del(&cmd_node->list);
13891389 spin_unlock_irqrestore(&adapter->scan_pending_q_lock,
13901390 flags);
1391− adapter->cmd_queued = cmd_node;
13921391 mwifiex_insert_cmd_to_pending_q(adapter, cmd_node,
13931392 true);
13941393 queue_work(adapter->workqueue, &adapter->main_work);
1394+
1395+ /* Perform internal scan synchronously */
1396+ if (!priv->scan_request)
1397+ mwifiex_wait_queue_complete(adapter, cmd_node);
13951398 } else {
13961399 spin_unlock_irqrestore(&adapter->scan_pending_q_lock,
13971400 flags);
@@ -1946,9 +1949,6 @@ int mwifiex_request_scan(struct mwifiex_private *priv, · 548 unmodified lines
19461949 /* Normal scan */
19471950 ret = mwifiex_scan_networks(priv, NULL);
19481951
1949− if (!ret)
1950− ret = mwifiex_wait_queue_complete(priv->adapter);
1951−
19521952 up(&priv->async_sem);
19531953
19541954 return ret;
drivers/net/wireless/mwifiex/sta_ioctl.c+2−8
@@ -54,16 +54,10 @@ int mwifiex_copy_mcast_addr(struct mwifiex_multicast_list *mlist, · 53 unmodified lines
5454 * This function waits on a cmd wait queue. It also cancels the pending
5555 * request after waking up, in case of errors.
5656 */
57−int mwifiex_wait_queue_complete(struct mwifiex_adapter *adapter)
57+int mwifiex_wait_queue_complete(struct mwifiex_adapter *adapter,
58+ struct cmd_ctrl_node *cmd_queued)
5859 {
5960 int status;
60− struct cmd_ctrl_node *cmd_queued;
61−
62− if (!adapter->cmd_queued)
63− return 0;
64−
65− cmd_queued = adapter->cmd_queued;
66− adapter->cmd_queued = NULL;
6761
6862 dev_dbg(adapter->dev, "cmd pending\n");
6963 atomic_inc(&adapter->cmd_pending);
drivers/net/wireless/rtlwifi/usb.c+1−0
@@ -850,6 +850,7 @@ static void _rtl_usb_transmit(struct ieee80211_hw *hw, struct sk_buff *skb, · 849 unmodified lines
850850 if (unlikely(!_urb)) {
851851 RT_TRACE(rtlpriv, COMP_ERR, DBG_EMERG,
852852 "Can't allocate urb. Drop skb!\n");
853+ kfree_skb(skb);
853854 return;
854855 }
855856 _rtl_submit_tx_urb(hw, _urb);
include/linux/thermal.h+1−1
@@ -44,7 +44,7 @@ · 43 unmodified lines
4444 /* Adding event notification support elements */
4545 #define THERMAL_GENL_FAMILY_NAME "thermal_event"
4646 #define THERMAL_GENL_VERSION 0x01
47−#define THERMAL_GENL_MCAST_GROUP_NAME "thermal_mc_group"
47+#define THERMAL_GENL_MCAST_GROUP_NAME "thermal_mc_grp"
4848
4949 /* Default Thermal Governor */
5050 #if defined(CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE)
include/uapi/linux/packet_diag.h+3−1
@@ -33,9 +33,11 @@ enum { · 32 unmodified lines
3333 PACKET_DIAG_TX_RING,
3434 PACKET_DIAG_FANOUT,
3535
36− PACKET_DIAG_MAX,
36+ __PACKET_DIAG_MAX,
3737 };
3838
39+#define PACKET_DIAG_MAX (__PACKET_DIAG_MAX - 1)
40+
3941 struct packet_diag_info {
4042 __u32 pdi_index;
4143 __u32 pdi_version;
include/uapi/linux/unix_diag.h+3−1
@@ -39,9 +39,11 @@ enum { · 38 unmodified lines
3939 UNIX_DIAG_MEMINFO,
4040 UNIX_DIAG_SHUTDOWN,
4141
42− UNIX_DIAG_MAX,
42+ __UNIX_DIAG_MAX,
4343 };
4444
45+#define UNIX_DIAG_MAX (__UNIX_DIAG_MAX - 1)
46+
4547 struct unix_diag_vfs {
4648 __u32 udiag_vfs_ino;
4749 __u32 udiag_vfs_dev;
net/bluetooth/sco.c+1−0
@@ -359,6 +359,7 @@ static void __sco_sock_close(struct sock *sk) · 358 unmodified lines
359359 sco_chan_del(sk, ECONNRESET);
360360 break;
361361
362+ case BT_CONNECT2:
362363 case BT_CONNECT:
363364 case BT_DISCONN:
364365 sco_chan_del(sk, ECONNRESET);
net/ipv4/tcp_output.c+5−2
@@ -1640,8 +1640,11 @@ static bool tcp_tso_should_defer(struct sock *sk, struct sk_buff *skb) · 1639 unmodified lines
16401640 goto send_now;
16411641 }
16421642
1643− /* Ok, it looks like it is advisable to defer. */
1644− tp->tso_deferred = 1 | (jiffies << 1);
1643+ /* Ok, it looks like it is advisable to defer.
1644+ * Do not rearm the timer if already set to not break TCP ACK clocking.
1645+ */
1646+ if (!tp->tso_deferred)
1647+ tp->tso_deferred = 1 | (jiffies << 1);
16451648
16461649 return true;
16471650

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t