renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-15 16:53:54 +08:00
Code

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

Browse Source 
Pull networking fixes from David Miller:

 1) Fix leak in fsl/fman driver, from Dan Carpenter.

 2) Call flow dissector initcall earlier than any networking driver can
    register and start to use it, from Eric Dumazet.

 3) Some dup header fixes from Geliang Tang.

 4) TIPC link monitoring compat fix from Jon Paul Maloy.

 5) Link changes require EEE re-negotiation in bcm_sf2 driver, from
    Florian Fainelli.

 6) Fix bogus handle ID passed into tfilter_notify_chain(), from Roman
    Mashak.

 7) Fix dump size calculation in rtnl_calcit(), from Zhang Shengju.

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (26 commits)
  tipc: resolve connection flow control compatibility problem
  mvpp2: use correct size for memset
  net/mlx5: drop duplicate header delay.h
  net: ieee802154: drop duplicate header delay.h
  ibmvnic: drop duplicate header seq_file.h
  fsl/fman: fix a leak in tgec_free()
  net: ethtool: don't require CAP_NET_ADMIN for ETHTOOL_GLINKSETTINGS
  tipc: improve sanity check for received domain records
  tipc: fix compatibility bug in link monitoring
  net: ethernet: mvneta: Remove IFF_UNICAST_FLT which is not implemented
  dwc_eth_qos: drop duplicate headers
  net sched filters: fix filter handle ID in tfilter_notify_chain()
  net: dsa: bcm_sf2: Ensure we re-negotiate EEE during after link change
  bnxt: do not busy-poll when link is down
  udplite: call proper backlog handlers
  ipv6: bump genid when the IFA_F_TENTATIVE flag is clear
  net/mlx4_en: Free netdev resources under state lock
  net: revert "net: l2tp: Treat NET_XMIT_CN as success in l2tp_eth_dev_xmit"
  rtnetlink: fix the wrong minimal dump size getting from rtnl_calcit()
  bnxt_en: Fix a VXLAN vs GENEVE issue
  ...
This commit is contained in:
Linus Torvalds 2016-11-26 13:05:05 -08:00
commit a0d60e62ea
35 changed files with 101 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/net/dsa/bcm_sf2.c
View File

@ -588,6 +588,7 @@ static void bcm_sf2_sw_adjust_link(struct dsa_switch *ds, int port,
struct phy_device *phydev) struct phy_device *phydev)
{ {
struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds); struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
struct ethtool_eee *p = &priv->port_sts[port].eee;
u32 id_mode_dis = 0, port_mode; u32 id_mode_dis = 0, port_mode;
const char *str = NULL; const char *str = NULL;
u32 reg; u32 reg;
@ -662,6 +663,9 @@ force_link:
reg |= DUPLX_MODE; reg |= DUPLX_MODE;
core_writel(priv, reg, CORE_STS_OVERRIDE_GMIIP_PORT(port)); core_writel(priv, reg, CORE_STS_OVERRIDE_GMIIP_PORT(port));
if (!phydev->is_pseudo_fixed_link)
p->eee_enabled = bcm_sf2_eee_init(ds, port, phydev);
} }
static void bcm_sf2_sw_fixed_link_update(struct dsa_switch *ds, int port, static void bcm_sf2_sw_fixed_link_update(struct dsa_switch *ds, int port,

15
drivers/net/ethernet/broadcom/bnxt/bnxt.c
View File

@ -1811,6 +1811,9 @@ static int bnxt_busy_poll(struct napi_struct *napi)
if (atomic_read(&bp->intr_sem) != 0) if (atomic_read(&bp->intr_sem) != 0)
return LL_FLUSH_FAILED; return LL_FLUSH_FAILED;
if (!bp->link_info.link_up)
return LL_FLUSH_FAILED;
if (!bnxt_lock_poll(bnapi)) if (!bnxt_lock_poll(bnapi))
return LL_FLUSH_BUSY; return LL_FLUSH_BUSY;
@ -3210,11 +3213,17 @@ static int bnxt_hwrm_tunnel_dst_port_alloc(struct bnxt *bp, __be16 port,
goto err_out; goto err_out;
} }
if (tunnel_type & TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_VXLAN) switch (tunnel_type) {
case TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_VXLAN:
bp->vxlan_fw_dst_port_id = resp->tunnel_dst_port_id; bp->vxlan_fw_dst_port_id = resp->tunnel_dst_port_id;
break;
else if (tunnel_type & TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_GENEVE) case TUNNEL_DST_PORT_ALLOC_REQ_TUNNEL_TYPE_GENEVE:
bp->nge_fw_dst_port_id = resp->tunnel_dst_port_id; bp->nge_fw_dst_port_id = resp->tunnel_dst_port_id;
break;
default:
break;
}
err_out: err_out:
mutex_unlock(&bp->hwrm_cmd_lock); mutex_unlock(&bp->hwrm_cmd_lock);
return rc; return rc;

3
drivers/net/ethernet/freescale/fman/fman_tgec.c
View File

@ -722,9 +722,6 @@ int tgec_free(struct fman_mac *tgec)
{ {
free_init_resources(tgec); free_init_resources(tgec);
if (tgec->cfg)
tgec->cfg = NULL;
kfree(tgec->cfg); kfree(tgec->cfg);
kfree(tgec); kfree(tgec);

1
drivers/net/ethernet/ibm/ibmvnic.c
View File

@ -74,7 +74,6 @@
#include <asm/iommu.h> #include <asm/iommu.h>
#include <linux/uaccess.h> #include <linux/uaccess.h>
#include <asm/firmware.h> #include <asm/firmware.h>
#include <linux/seq_file.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include "ibmvnic.h" #include "ibmvnic.h"

2
drivers/net/ethernet/marvell/mvneta.c
View File

@ -4151,7 +4151,7 @@ static int mvneta_probe(struct platform_device *pdev)
dev->features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO; dev->features = NETIF_F_SG | NETIF_F_IP_CSUM | NETIF_F_TSO;
dev->hw_features |= dev->features; dev->hw_features |= dev->features;
dev->vlan_features |= dev->features; dev->vlan_features |= dev->features;
dev->priv_flags |= IFF_UNICAST_FLT | IFF_LIVE_ADDR_CHANGE; dev->priv_flags |= IFF_LIVE_ADDR_CHANGE;
dev->gso_max_segs = MVNETA_MAX_TSO_SEGS; dev->gso_max_segs = MVNETA_MAX_TSO_SEGS;
err = register_netdev(dev); err = register_netdev(dev);

2
drivers/net/ethernet/marvell/mvpp2.c
View File

@ -3293,7 +3293,7 @@ static void mvpp2_cls_init(struct mvpp2 *priv)
mvpp2_write(priv, MVPP2_CLS_MODE_REG, MVPP2_CLS_MODE_ACTIVE_MASK); mvpp2_write(priv, MVPP2_CLS_MODE_REG, MVPP2_CLS_MODE_ACTIVE_MASK);
/* Clear classifier flow table */ /* Clear classifier flow table */
memset(&fe.data, 0, MVPP2_CLS_FLOWS_TBL_DATA_WORDS); memset(&fe.data, 0, sizeof(fe.data));
for (index = 0; index < MVPP2_CLS_FLOWS_TBL_SIZE; index++) { for (index = 0; index < MVPP2_CLS_FLOWS_TBL_SIZE; index++) {
fe.index = index; fe.index = index;
mvpp2_cls_flow_write(priv, &fe); mvpp2_cls_flow_write(priv, &fe);

5
drivers/net/ethernet/mellanox/mlx4/en_netdev.c
View File

@ -129,6 +129,9 @@ static enum mlx4_net_trans_rule_id mlx4_ip_proto_to_trans_rule_id(u8 ip_proto)
} }
}; };
/* Must not acquire state_lock, as its corresponding work_sync
* is done under it.
*/
static void mlx4_en_filter_work(struct work_struct *work) static void mlx4_en_filter_work(struct work_struct *work)
{ {
struct mlx4_en_filter *filter = container_of(work, struct mlx4_en_filter *filter = container_of(work,
@ -2189,13 +2192,13 @@ void mlx4_en_destroy_netdev(struct net_device *dev)
mutex_lock(&mdev->state_lock); mutex_lock(&mdev->state_lock);
mdev->pndev[priv->port] = NULL; mdev->pndev[priv->port] = NULL;
mdev->upper[priv->port] = NULL; mdev->upper[priv->port] = NULL;
mutex_unlock(&mdev->state_lock);
#ifdef CONFIG_RFS_ACCEL #ifdef CONFIG_RFS_ACCEL
mlx4_en_cleanup_filters(priv); mlx4_en_cleanup_filters(priv);
#endif #endif
mlx4_en_free_resources(priv); mlx4_en_free_resources(priv);
mutex_unlock(&mdev->state_lock);
kfree(priv->tx_ring); kfree(priv->tx_ring);
kfree(priv->tx_cq); kfree(priv->tx_cq);

1
drivers/net/ethernet/mellanox/mlx5/core/main.c
View File

@ -46,7 +46,6 @@
#include <linux/mlx5/srq.h> #include <linux/mlx5/srq.h>
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/kmod.h> #include <linux/kmod.h>
#include <linux/delay.h>
#include <linux/mlx5/mlx5_ifc.h> #include <linux/mlx5/mlx5_ifc.h>
#ifdef CONFIG_RFS_ACCEL #ifdef CONFIG_RFS_ACCEL
#include <linux/cpu_rmap.h> #include <linux/cpu_rmap.h>

2
drivers/net/ethernet/synopsys/dwc_eth_qos.c
View File

@ -33,7 +33,6 @@
#include <linux/stat.h> #include <linux/stat.h>
#include <linux/types.h> #include <linux/types.h>
#include <linux/types.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/mm.h> #include <linux/mm.h>
@ -43,7 +42,6 @@
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/mii.h> #include <linux/mii.h>
#include <linux/delay.h>
#include <linux/dma-mapping.h> #include <linux/dma-mapping.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>

1
drivers/net/ieee802154/adf7242.c
View File

@ -20,7 +20,6 @@
#include <linux/skbuff.h> #include <linux/skbuff.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/irq.h> #include <linux/irq.h>
#include <linux/delay.h>
#include <linux/debugfs.h> #include <linux/debugfs.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/ieee802154.h> #include <linux/ieee802154.h>

3
drivers/net/macvlan.c
View File

@ -623,7 +623,8 @@ hash_add:
return 0; return 0;
clear_multi: clear_multi:
dev_set_allmulti(lowerdev, -1); if (dev->flags & IFF_ALLMULTI)
dev_set_allmulti(lowerdev, -1);
del_unicast: del_unicast:
dev_uc_del(lowerdev, dev->dev_addr); dev_uc_del(lowerdev, dev->dev_addr);
out: out:

8
drivers/net/phy/micrel.c
View File

@ -318,12 +318,12 @@ static int ksz8041_config_init(struct phy_device *phydev)
/* Limit supported and advertised modes in fiber mode */ /* Limit supported and advertised modes in fiber mode */
if (of_property_read_bool(of_node, "micrel,fiber-mode")) { if (of_property_read_bool(of_node, "micrel,fiber-mode")) {
phydev->dev_flags |= MICREL_PHY_FXEN; phydev->dev_flags |= MICREL_PHY_FXEN;
phydev->supported &= SUPPORTED_FIBRE | phydev->supported &= SUPPORTED_100baseT_Full |
SUPPORTED_100baseT_Full |
SUPPORTED_100baseT_Half; SUPPORTED_100baseT_Half;
phydev->advertising &= ADVERTISED_FIBRE | phydev->supported |= SUPPORTED_FIBRE;
ADVERTISED_100baseT_Full | phydev->advertising &= ADVERTISED_100baseT_Full |
ADVERTISED_100baseT_Half; ADVERTISED_100baseT_Half;
phydev->advertising |= ADVERTISED_FIBRE;
phydev->autoneg = AUTONEG_DISABLE; phydev->autoneg = AUTONEG_DISABLE;
} }

2
include/linux/netdevice.h
View File

@ -1619,7 +1619,7 @@ enum netdev_priv_flags {
* @dcbnl_ops: Data Center Bridging netlink ops * @dcbnl_ops: Data Center Bridging netlink ops
* @num_tc: Number of traffic classes in the net device * @num_tc: Number of traffic classes in the net device
* @tc_to_txq: XXX: need comments on this one * @tc_to_txq: XXX: need comments on this one
* @prio_tc_map XXX: need comments on this one * @prio_tc_map: XXX: need comments on this one
* *
* @fcoe_ddp_xid: Max exchange id for FCoE LRO by ddp * @fcoe_ddp_xid: Max exchange id for FCoE LRO by ddp
* *

2
include/net/bluetooth/hci_core.h
View File

@ -1018,7 +1018,7 @@ static inline void hci_set_drvdata(struct hci_dev *hdev, void *data)
} }
struct hci_dev *hci_dev_get(int index); struct hci_dev *hci_dev_get(int index);
struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src); struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src, u8 src_type);
struct hci_dev *hci_alloc_dev(void); struct hci_dev *hci_alloc_dev(void);
void hci_free_dev(struct hci_dev *hdev); void hci_free_dev(struct hci_dev *hdev);

4
net/bluetooth/6lowpan.c
View File

@ -1090,7 +1090,6 @@ static int get_l2cap_conn(char *buf, bdaddr_t *addr, u8 *addr_type,
{ {
struct hci_conn *hcon; struct hci_conn *hcon;
struct hci_dev *hdev; struct hci_dev *hdev;
bdaddr_t *src = BDADDR_ANY;
int n; int n;
n = sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx %hhu", n = sscanf(buf, "%hhx:%hhx:%hhx:%hhx:%hhx:%hhx %hhu",
@ -1101,7 +1100,8 @@ static int get_l2cap_conn(char *buf, bdaddr_t *addr, u8 *addr_type,
if (n < 7) if (n < 7)
return -EINVAL; return -EINVAL;
hdev = hci_get_route(addr, src); /* The LE_PUBLIC address type is ignored because of BDADDR_ANY */
hdev = hci_get_route(addr, BDADDR_ANY, BDADDR_LE_PUBLIC);
if (!hdev) if (!hdev)
return -ENOENT; return -ENOENT;

26
net/bluetooth/hci_conn.c
View File

@ -613,7 +613,7 @@ int hci_conn_del(struct hci_conn *conn)
return 0; return 0;
} }
struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src) struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src, uint8_t src_type)
{ {
int use_src = bacmp(src, BDADDR_ANY); int use_src = bacmp(src, BDADDR_ANY);
struct hci_dev *hdev = NULL, *d; struct hci_dev *hdev = NULL, *d;
@ -634,7 +634,29 @@ struct hci_dev *hci_get_route(bdaddr_t *dst, bdaddr_t *src)
*/ */
if (use_src) { if (use_src) {
if (!bacmp(&d->bdaddr, src)) { bdaddr_t id_addr;
u8 id_addr_type;
if (src_type == BDADDR_BREDR) {
if (!lmp_bredr_capable(d))
continue;
bacpy(&id_addr, &d->bdaddr);
id_addr_type = BDADDR_BREDR;
} else {
if (!lmp_le_capable(d))
continue;
hci_copy_identity_address(d, &id_addr,
&id_addr_type);
/* Convert from HCI to three-value type */
if (id_addr_type == ADDR_LE_DEV_PUBLIC)
id_addr_type = BDADDR_LE_PUBLIC;
else
id_addr_type = BDADDR_LE_RANDOM;
}
if (!bacmp(&id_addr, src) && id_addr_type == src_type) {
hdev = d; break; hdev = d; break;
} }
} else { } else {

2
net/bluetooth/l2cap_core.c
View File

@ -7060,7 +7060,7 @@ int l2cap_chan_connect(struct l2cap_chan *chan, __le16 psm, u16 cid,
BT_DBG("%pMR -> %pMR (type %u) psm 0x%2.2x", &chan->src, dst, BT_DBG("%pMR -> %pMR (type %u) psm 0x%2.2x", &chan->src, dst,
dst_type, __le16_to_cpu(psm)); dst_type, __le16_to_cpu(psm));
hdev = hci_get_route(dst, &chan->src); hdev = hci_get_route(dst, &chan->src, chan->src_type);
if (!hdev) if (!hdev)
return -EHOSTUNREACH; return -EHOSTUNREACH;

2
net/bluetooth/rfcomm/tty.c
View File

@ -178,7 +178,7 @@ static void rfcomm_reparent_device(struct rfcomm_dev *dev)
struct hci_dev *hdev; struct hci_dev *hdev;
struct hci_conn *conn; struct hci_conn *conn;
hdev = hci_get_route(&dev->dst, &dev->src); hdev = hci_get_route(&dev->dst, &dev->src, BDADDR_BREDR);
if (!hdev) if (!hdev)
return; return;

2
net/bluetooth/sco.c
View File

@ -219,7 +219,7 @@ static int sco_connect(struct sock *sk)
BT_DBG("%pMR -> %pMR", &sco_pi(sk)->src, &sco_pi(sk)->dst); BT_DBG("%pMR -> %pMR", &sco_pi(sk)->src, &sco_pi(sk)->dst);
hdev = hci_get_route(&sco_pi(sk)->dst, &sco_pi(sk)->src); hdev = hci_get_route(&sco_pi(sk)->dst, &sco_pi(sk)->src, BDADDR_BREDR);
if (!hdev) if (!hdev)
return -EHOSTUNREACH; return -EHOSTUNREACH;

18
net/can/bcm.c
View File

@ -77,7 +77,7 @@
(CAN_EFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG) : \ (CAN_EFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG) : \
(CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG)) (CAN_SFF_MASK | CAN_EFF_FLAG | CAN_RTR_FLAG))
#define CAN_BCM_VERSION "20160617" #define CAN_BCM_VERSION "20161123"
MODULE_DESCRIPTION("PF_CAN broadcast manager protocol"); MODULE_DESCRIPTION("PF_CAN broadcast manager protocol");
MODULE_LICENSE("Dual BSD/GPL"); MODULE_LICENSE("Dual BSD/GPL");
@ -109,8 +109,9 @@ struct bcm_op {
u32 count; u32 count;
u32 nframes; u32 nframes;
u32 currframe; u32 currframe;
struct canfd_frame *frames; /* void pointers to arrays of struct can[fd]_frame */
struct canfd_frame *last_frames; void *frames;
void *last_frames;
struct canfd_frame sframe; struct canfd_frame sframe;
struct canfd_frame last_sframe; struct canfd_frame last_sframe;
struct sock *sk; struct sock *sk;
@ -681,7 +682,7 @@ static void bcm_rx_handler(struct sk_buff *skb, void *data)
if (op->flags & RX_FILTER_ID) { if (op->flags & RX_FILTER_ID) {
/* the easiest case */ /* the easiest case */
bcm_rx_update_and_send(op, &op->last_frames[0], rxframe); bcm_rx_update_and_send(op, op->last_frames, rxframe);
goto rx_starttimer; goto rx_starttimer;
} }
@ -1068,7 +1069,7 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,
if (msg_head->nframes) { if (msg_head->nframes) {
/* update CAN frames content */ /* update CAN frames content */
err = memcpy_from_msg((u8 *)op->frames, msg, err = memcpy_from_msg(op->frames, msg,
msg_head->nframes * op->cfsiz); msg_head->nframes * op->cfsiz);
if (err < 0) if (err < 0)
return err; return err;
@ -1118,7 +1119,7 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,
} }
if (msg_head->nframes) { if (msg_head->nframes) {
err = memcpy_from_msg((u8 *)op->frames, msg, err = memcpy_from_msg(op->frames, msg,
msg_head->nframes * op->cfsiz); msg_head->nframes * op->cfsiz);
if (err < 0) { if (err < 0) {
if (op->frames != &op->sframe) if (op->frames != &op->sframe)
@ -1163,6 +1164,7 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,
/* check flags */ /* check flags */
if (op->flags & RX_RTR_FRAME) { if (op->flags & RX_RTR_FRAME) {
struct canfd_frame *frame0 = op->frames;
/* no timers in RTR-mode */ /* no timers in RTR-mode */
hrtimer_cancel(&op->thrtimer); hrtimer_cancel(&op->thrtimer);
@ -1174,8 +1176,8 @@ static int bcm_rx_setup(struct bcm_msg_head *msg_head, struct msghdr *msg,
* prevent a full-load-loopback-test ... ;-] * prevent a full-load-loopback-test ... ;-]
*/ */
if ((op->flags & TX_CP_CAN_ID) || if ((op->flags & TX_CP_CAN_ID) ||
(op->frames[0].can_id == op->can_id)) (frame0->can_id == op->can_id))
op->frames[0].can_id = op->can_id & ~CAN_RTR_FLAG; frame0->can_id = op->can_id & ~CAN_RTR_FLAG;
} else { } else {
if (op->flags & SETTIMER) { if (op->flags & SETTIMER) {

1
net/core/ethtool.c
View File

@ -2479,6 +2479,7 @@ int dev_ethtool(struct net *net, struct ifreq *ifr)
case ETHTOOL_GET_TS_INFO: case ETHTOOL_GET_TS_INFO:
case ETHTOOL_GEEE: case ETHTOOL_GEEE:
case ETHTOOL_GTUNABLE: case ETHTOOL_GTUNABLE:
case ETHTOOL_GLINKSETTINGS:
break; break;
default: default:
if (!ns_capable(net->user_ns, CAP_NET_ADMIN)) if (!ns_capable(net->user_ns, CAP_NET_ADMIN))

2
net/core/flow_dissector.c
View File

@ -1013,4 +1013,4 @@ static int __init init_default_flow_dissectors(void)
return 0; return 0;
} }
late_initcall_sync(init_default_flow_dissectors); core_initcall(init_default_flow_dissectors);

2
net/core/rtnetlink.c
View File

@ -2737,7 +2737,7 @@ static u16 rtnl_calcit(struct sk_buff *skb, struct nlmsghdr *nlh)
ext_filter_mask)); ext_filter_mask));
} }
return min_ifinfo_dump_size; return nlmsg_total_size(min_ifinfo_dump_size);
} }
static int rtnl_dump_all(struct sk_buff *skb, struct netlink_callback *cb) static int rtnl_dump_all(struct sk_buff *skb, struct netlink_callback *cb)

2
net/ipv4/udp.c
View File

@ -1455,7 +1455,7 @@ static void udp_v4_rehash(struct sock *sk)
udp_lib_rehash(sk, new_hash); udp_lib_rehash(sk, new_hash);
} }
static int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
{ {
int rc; int rc;

2
net/ipv4/udp_impl.h
View File

@ -25,7 +25,7 @@ int udp_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,
int flags, int *addr_len); int flags, int *addr_len);
int udp_sendpage(struct sock *sk, struct page *page, int offset, size_t size, int udp_sendpage(struct sock *sk, struct page *page, int offset, size_t size,
int flags); int flags);
int udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb); int __udp_queue_rcv_skb(struct sock *sk, struct sk_buff *skb);
void udp_destroy_sock(struct sock *sk); void udp_destroy_sock(struct sock *sk);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS

2
net/ipv4/udplite.c
View File

@ -50,7 +50,7 @@ struct proto udplite_prot = {
.sendmsg = udp_sendmsg, .sendmsg = udp_sendmsg,
.recvmsg = udp_recvmsg, .recvmsg = udp_recvmsg,
.sendpage = udp_sendpage, .sendpage = udp_sendpage,
.backlog_rcv = udp_queue_rcv_skb, .backlog_rcv = __udp_queue_rcv_skb,
.hash = udp_lib_hash, .hash = udp_lib_hash,
.unhash = udp_lib_unhash, .unhash = udp_lib_unhash,
.get_port = udp_v4_get_port, .get_port = udp_v4_get_port,

18
net/ipv6/addrconf.c
View File

@ -183,7 +183,7 @@ static struct rt6_info *addrconf_get_prefix_route(const struct in6_addr *pfx,
static void addrconf_dad_start(struct inet6_ifaddr *ifp); static void addrconf_dad_start(struct inet6_ifaddr *ifp);
static void addrconf_dad_work(struct work_struct *w); static void addrconf_dad_work(struct work_struct *w);
static void addrconf_dad_completed(struct inet6_ifaddr *ifp); static void addrconf_dad_completed(struct inet6_ifaddr *ifp, bool bump_id);
static void addrconf_dad_run(struct inet6_dev *idev); static void addrconf_dad_run(struct inet6_dev *idev);
static void addrconf_rs_timer(unsigned long data); static void addrconf_rs_timer(unsigned long data);
static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifa); static void __ipv6_ifa_notify(int event, struct inet6_ifaddr *ifa);
@ -2898,6 +2898,7 @@ static void add_addr(struct inet6_dev *idev, const struct in6_addr *addr,
spin_lock_bh(&ifp->lock); spin_lock_bh(&ifp->lock);
ifp->flags &= ~IFA_F_TENTATIVE; ifp->flags &= ~IFA_F_TENTATIVE;
spin_unlock_bh(&ifp->lock); spin_unlock_bh(&ifp->lock);
rt_genid_bump_ipv6(dev_net(idev->dev));
ipv6_ifa_notify(RTM_NEWADDR, ifp); ipv6_ifa_notify(RTM_NEWADDR, ifp);
in6_ifa_put(ifp); in6_ifa_put(ifp);
} }
@ -3740,7 +3741,7 @@ static void addrconf_dad_begin(struct inet6_ifaddr *ifp)
{ {
struct inet6_dev *idev = ifp->idev; struct inet6_dev *idev = ifp->idev;
struct net_device *dev = idev->dev; struct net_device *dev = idev->dev;
bool notify = false; bool bump_id, notify = false;
addrconf_join_solict(dev, &ifp->addr); addrconf_join_solict(dev, &ifp->addr);
@ -3755,11 +3756,12 @@ static void addrconf_dad_begin(struct inet6_ifaddr *ifp)
idev->cnf.accept_dad < 1 || idev->cnf.accept_dad < 1 ||
!(ifp->flags&IFA_F_TENTATIVE) || !(ifp->flags&IFA_F_TENTATIVE) ||
ifp->flags & IFA_F_NODAD) { ifp->flags & IFA_F_NODAD) {
bump_id = ifp->flags & IFA_F_TENTATIVE;
ifp->flags &= ~(IFA_F_TENTATIVE|IFA_F_OPTIMISTIC|IFA_F_DADFAILED); ifp->flags &= ~(IFA_F_TENTATIVE|IFA_F_OPTIMISTIC|IFA_F_DADFAILED);
spin_unlock(&ifp->lock); spin_unlock(&ifp->lock);
read_unlock_bh(&idev->lock); read_unlock_bh(&idev->lock);
addrconf_dad_completed(ifp); addrconf_dad_completed(ifp, bump_id);
return; return;
} }
@ -3819,8 +3821,8 @@ static void addrconf_dad_work(struct work_struct *w)
struct inet6_ifaddr, struct inet6_ifaddr,
dad_work); dad_work);
struct inet6_dev *idev = ifp->idev; struct inet6_dev *idev = ifp->idev;
bool bump_id, disable_ipv6 = false;
struct in6_addr mcaddr; struct in6_addr mcaddr;
bool disable_ipv6 = false;
enum { enum {
DAD_PROCESS, DAD_PROCESS,
@ -3890,11 +3892,12 @@ static void addrconf_dad_work(struct work_struct *w)
* DAD was successful * DAD was successful
*/ */
bump_id = ifp->flags & IFA_F_TENTATIVE;
ifp->flags &= ~(IFA_F_TENTATIVE|IFA_F_OPTIMISTIC|IFA_F_DADFAILED); ifp->flags &= ~(IFA_F_TENTATIVE|IFA_F_OPTIMISTIC|IFA_F_DADFAILED);
spin_unlock(&ifp->lock); spin_unlock(&ifp->lock);
write_unlock_bh(&idev->lock); write_unlock_bh(&idev->lock);
addrconf_dad_completed(ifp); addrconf_dad_completed(ifp, bump_id);
goto out; goto out;
} }
@ -3931,7 +3934,7 @@ static bool ipv6_lonely_lladdr(struct inet6_ifaddr *ifp)
return true; return true;
} }
static void addrconf_dad_completed(struct inet6_ifaddr *ifp) static void addrconf_dad_completed(struct inet6_ifaddr *ifp, bool bump_id)
{ {
struct net_device *dev = ifp->idev->dev; struct net_device *dev = ifp->idev->dev;
struct in6_addr lladdr; struct in6_addr lladdr;
@ -3983,6 +3986,9 @@ static void addrconf_dad_completed(struct inet6_ifaddr *ifp)
spin_unlock(&ifp->lock); spin_unlock(&ifp->lock);
write_unlock_bh(&ifp->idev->lock); write_unlock_bh(&ifp->idev->lock);
} }
if (bump_id)
rt_genid_bump_ipv6(dev_net(dev));
} }
static void addrconf_dad_run(struct inet6_dev *idev) static void addrconf_dad_run(struct inet6_dev *idev)

2
net/ipv6/udp.c
View File

@ -514,7 +514,7 @@ out:
return; return;
} }
static int __udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb) int __udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb)
{ {
int rc; int rc;

2
net/ipv6/udp_impl.h
View File

@ -26,7 +26,7 @@ int compat_udpv6_getsockopt(struct sock *sk, int level, int optname,
int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len); int udpv6_sendmsg(struct sock *sk, struct msghdr *msg, size_t len);
int udpv6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock, int udpv6_recvmsg(struct sock *sk, struct msghdr *msg, size_t len, int noblock,
int flags, int *addr_len); int flags, int *addr_len);
int udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb); int __udpv6_queue_rcv_skb(struct sock *sk, struct sk_buff *skb);
void udpv6_destroy_sock(struct sock *sk); void udpv6_destroy_sock(struct sock *sk);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS

2
net/ipv6/udplite.c
View File

@ -45,7 +45,7 @@ struct proto udplitev6_prot = {
.getsockopt = udpv6_getsockopt, .getsockopt = udpv6_getsockopt,
.sendmsg = udpv6_sendmsg, .sendmsg = udpv6_sendmsg,
.recvmsg = udpv6_recvmsg, .recvmsg = udpv6_recvmsg,
.backlog_rcv = udpv6_queue_rcv_skb, .backlog_rcv = __udpv6_queue_rcv_skb,
.hash = udp_lib_hash, .hash = udp_lib_hash,
.unhash = udp_lib_unhash, .unhash = udp_lib_unhash,
.get_port = udp_v6_get_port, .get_port = udp_v6_get_port,

2
net/l2tp/l2tp_eth.c
View File

@ -97,7 +97,7 @@ static int l2tp_eth_dev_xmit(struct sk_buff *skb, struct net_device *dev)
unsigned int len = skb->len; unsigned int len = skb->len;
int ret = l2tp_xmit_skb(session, skb, session->hdr_len); int ret = l2tp_xmit_skb(session, skb, session->hdr_len);
if (likely(ret == NET_XMIT_SUCCESS || ret == NET_XMIT_CN)) { if (likely(ret == NET_XMIT_SUCCESS)) {
atomic_long_add(len, &priv->tx_bytes); atomic_long_add(len, &priv->tx_bytes);
atomic_long_inc(&priv->tx_packets); atomic_long_inc(&priv->tx_packets);
} else { } else {

2
net/sched/cls_api.c
View File

@ -112,7 +112,7 @@ static void tfilter_notify_chain(struct net *net, struct sk_buff *oskb,
for (it_chain = chain; (tp = rtnl_dereference(*it_chain)) != NULL; for (it_chain = chain; (tp = rtnl_dereference(*it_chain)) != NULL;
it_chain = &tp->next) it_chain = &tp->next)
tfilter_notify(net, oskb, n, tp, n->nlmsg_flags, event, false); tfilter_notify(net, oskb, n, tp, 0, event, false);
} }
/* Select new prio value from the range, managed by kernel. */ /* Select new prio value from the range, managed by kernel. */

5
net/tipc/link.c
View File

@ -1492,8 +1492,9 @@ static int tipc_link_proto_rcv(struct tipc_link *l, struct sk_buff *skb,
if (in_range(peers_tol, TIPC_MIN_LINK_TOL, TIPC_MAX_LINK_TOL)) if (in_range(peers_tol, TIPC_MIN_LINK_TOL, TIPC_MAX_LINK_TOL))
l->tolerance = peers_tol; l->tolerance = peers_tol;
if (peers_prio && in_range(peers_prio, TIPC_MIN_LINK_PRI, /* Update own prio if peer indicates a different value */
TIPC_MAX_LINK_PRI)) { if ((peers_prio != l->priority) &&
in_range(peers_prio, 1, TIPC_MAX_LINK_PRI)) {
l->priority = peers_prio; l->priority = peers_prio;
rc = tipc_link_fsm_evt(l, LINK_FAILURE_EVT); rc = tipc_link_fsm_evt(l, LINK_FAILURE_EVT);
} }

10
net/tipc/monitor.c
View File

@ -455,14 +455,14 @@ void tipc_mon_rcv(struct net *net, void *data, u16 dlen, u32 addr,
int i, applied_bef; int i, applied_bef;
state->probing = false; state->probing = false;
if (!dlen)
return;
/* Sanity check received domain record */ /* Sanity check received domain record */
if ((dlen < new_dlen) || ntohs(arrv_dom->len) != new_dlen) { if (dlen < dom_rec_len(arrv_dom, 0))
pr_warn_ratelimited("Received illegal domain record\n"); return;
if (dlen != dom_rec_len(arrv_dom, new_member_cnt))
return;
if ((dlen < new_dlen) || ntohs(arrv_dom->len) != new_dlen)
return; return;
}
/* Synch generation numbers with peer if link just came up */ /* Synch generation numbers with peer if link just came up */
if (!state->synched) { if (!state->synched) {

2
net/tipc/socket.c
View File

@ -186,7 +186,7 @@ static struct tipc_sock *tipc_sk(const struct sock *sk)
static bool tsk_conn_cong(struct tipc_sock *tsk) static bool tsk_conn_cong(struct tipc_sock *tsk)
{ {
return tsk->snt_unacked >= tsk->snd_win; return tsk->snt_unacked > tsk->snd_win;
} }
/* tsk_blocks(): translate a buffer size in bytes to number of /* tsk_blocks(): translate a buffer size in bytes to number of