Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes from David Miller: 1) Limit the number of can filters to avoid > MAX_ORDER allocations. Fix from Marc Kleine-Budde. 2) Limit GSO max size in netvsc driver to avoid problems with NVGRE configurations. From Stephen Hemminger. 3) Return proper error when memory allocation fails in ser_gigaset_init(), from Dan Carpenter. 4) Missing linkage undo in error paths of ipvlan_link_new(), from Gao Feng. 5) Missing necessayr SET_NETDEV_DEV in lantiq and cpmac drivers, from Florian Fainelli. 6) Handle probe deferral properly in smsc911x driver. * git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: net: mlx5: Fix Kconfig help text net: smsc911x: back out silently on probe deferrals ibmveth: set correct gso_size and gso_type net: ethernet: cpmac: Call SET_NETDEV_DEV() net: ethernet: lantiq_etop: Call SET_NETDEV_DEV() vhost-vsock: fix orphan connection reset cxgb4/cxgb4vf: Assign netdev->dev_port with port ID driver: ipvlan: Unlink the upper dev when ipvlan_link_new failed ser_gigaset: return -ENOMEM on error instead of success NET: usb: cdc_mbim: add quirk for supporting Telit LE922A can: peak: fix bad memory access and free sequence phy: Don't increment MDIO bus refcount unless it's a different owner netvsc: reduce maximum GSO size drivers: net: cpsw-phy-sel: Clear RGMII_IDMODE on "rgmii" links can: raw: raw_setsockopt: limit number of can_filter that can be set
This commit is contained in:
commit
cd6628953e
|
@ -755,8 +755,10 @@ static int __init ser_gigaset_init(void)
|
|||
driver = gigaset_initdriver(GIGASET_MINOR, GIGASET_MINORS,
|
||||
GIGASET_MODULENAME, GIGASET_DEVNAME,
|
||||
&ops, THIS_MODULE);
|
||||
if (!driver)
|
||||
if (!driver) {
|
||||
rc = -ENOMEM;
|
||||
goto error;
|
||||
}
|
||||
|
||||
rc = tty_register_ldisc(N_GIGASET_M101, &gigaset_ldisc);
|
||||
if (rc != 0) {
|
||||
|
|
|
@ -870,23 +870,25 @@ lbl_free_candev:
|
|||
static void peak_usb_disconnect(struct usb_interface *intf)
|
||||
{
|
||||
struct peak_usb_device *dev;
|
||||
struct peak_usb_device *dev_prev_siblings;
|
||||
|
||||
/* unregister as many netdev devices as siblings */
|
||||
for (dev = usb_get_intfdata(intf); dev; dev = dev->prev_siblings) {
|
||||
for (dev = usb_get_intfdata(intf); dev; dev = dev_prev_siblings) {
|
||||
struct net_device *netdev = dev->netdev;
|
||||
char name[IFNAMSIZ];
|
||||
|
||||
dev_prev_siblings = dev->prev_siblings;
|
||||
dev->state &= ~PCAN_USB_STATE_CONNECTED;
|
||||
strncpy(name, netdev->name, IFNAMSIZ);
|
||||
|
||||
unregister_netdev(netdev);
|
||||
free_candev(netdev);
|
||||
|
||||
kfree(dev->cmd_buf);
|
||||
dev->next_siblings = NULL;
|
||||
if (dev->adapter->dev_free)
|
||||
dev->adapter->dev_free(dev);
|
||||
|
||||
free_candev(netdev);
|
||||
dev_info(&intf->dev, "%s removed\n", name);
|
||||
}
|
||||
|
||||
|
|
|
@ -4931,6 +4931,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||
*/
|
||||
for_each_port(adapter, i) {
|
||||
pi = adap2pinfo(adapter, i);
|
||||
adapter->port[i]->dev_port = pi->lport;
|
||||
netif_set_real_num_tx_queues(adapter->port[i], pi->nqsets);
|
||||
netif_set_real_num_rx_queues(adapter->port[i], pi->nqsets);
|
||||
|
||||
|
|
|
@ -7851,7 +7851,6 @@ int t4_port_init(struct adapter *adap, int mbox, int pf, int vf)
|
|||
return ret;
|
||||
|
||||
memcpy(adap->port[i]->dev_addr, addr, ETH_ALEN);
|
||||
adap->port[i]->dev_port = j;
|
||||
j++;
|
||||
}
|
||||
return 0;
|
||||
|
|
|
@ -2969,6 +2969,7 @@ static int cxgb4vf_pci_probe(struct pci_dev *pdev,
|
|||
|
||||
netdev->netdev_ops = &cxgb4vf_netdev_ops;
|
||||
netdev->ethtool_ops = &cxgb4vf_ethtool_ops;
|
||||
netdev->dev_port = pi->port_id;
|
||||
|
||||
/*
|
||||
* Initialize the hardware/software state for the port.
|
||||
|
|
|
@ -58,7 +58,7 @@ static struct kobj_type ktype_veth_pool;
|
|||
|
||||
static const char ibmveth_driver_name[] = "ibmveth";
|
||||
static const char ibmveth_driver_string[] = "IBM Power Virtual Ethernet Driver";
|
||||
#define ibmveth_driver_version "1.05"
|
||||
#define ibmveth_driver_version "1.06"
|
||||
|
||||
MODULE_AUTHOR("Santiago Leon <santil@linux.vnet.ibm.com>");
|
||||
MODULE_DESCRIPTION("IBM Power Virtual Ethernet Driver");
|
||||
|
@ -137,6 +137,11 @@ static inline int ibmveth_rxq_frame_offset(struct ibmveth_adapter *adapter)
|
|||
return ibmveth_rxq_flags(adapter) & IBMVETH_RXQ_OFF_MASK;
|
||||
}
|
||||
|
||||
static inline int ibmveth_rxq_large_packet(struct ibmveth_adapter *adapter)
|
||||
{
|
||||
return ibmveth_rxq_flags(adapter) & IBMVETH_RXQ_LRG_PKT;
|
||||
}
|
||||
|
||||
static inline int ibmveth_rxq_frame_length(struct ibmveth_adapter *adapter)
|
||||
{
|
||||
return be32_to_cpu(adapter->rx_queue.queue_addr[adapter->rx_queue.index].length);
|
||||
|
@ -1174,6 +1179,45 @@ map_failed:
|
|||
goto retry_bounce;
|
||||
}
|
||||
|
||||
static void ibmveth_rx_mss_helper(struct sk_buff *skb, u16 mss, int lrg_pkt)
|
||||
{
|
||||
int offset = 0;
|
||||
|
||||
/* only TCP packets will be aggregated */
|
||||
if (skb->protocol == htons(ETH_P_IP)) {
|
||||
struct iphdr *iph = (struct iphdr *)skb->data;
|
||||
|
||||
if (iph->protocol == IPPROTO_TCP) {
|
||||
offset = iph->ihl * 4;
|
||||
skb_shinfo(skb)->gso_type = SKB_GSO_TCPV4;
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
} else if (skb->protocol == htons(ETH_P_IPV6)) {
|
||||
struct ipv6hdr *iph6 = (struct ipv6hdr *)skb->data;
|
||||
|
||||
if (iph6->nexthdr == IPPROTO_TCP) {
|
||||
offset = sizeof(struct ipv6hdr);
|
||||
skb_shinfo(skb)->gso_type = SKB_GSO_TCPV6;
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
} else {
|
||||
return;
|
||||
}
|
||||
/* if mss is not set through Large Packet bit/mss in rx buffer,
|
||||
* expect that the mss will be written to the tcp header checksum.
|
||||
*/
|
||||
if (lrg_pkt) {
|
||||
skb_shinfo(skb)->gso_size = mss;
|
||||
} else if (offset) {
|
||||
struct tcphdr *tcph = (struct tcphdr *)(skb->data + offset);
|
||||
|
||||
skb_shinfo(skb)->gso_size = ntohs(tcph->check);
|
||||
tcph->check = 0;
|
||||
}
|
||||
}
|
||||
|
||||
static int ibmveth_poll(struct napi_struct *napi, int budget)
|
||||
{
|
||||
struct ibmveth_adapter *adapter =
|
||||
|
@ -1182,6 +1226,7 @@ static int ibmveth_poll(struct napi_struct *napi, int budget)
|
|||
int frames_processed = 0;
|
||||
unsigned long lpar_rc;
|
||||
struct iphdr *iph;
|
||||
u16 mss = 0;
|
||||
|
||||
restart_poll:
|
||||
while (frames_processed < budget) {
|
||||
|
@ -1199,9 +1244,21 @@ restart_poll:
|
|||
int length = ibmveth_rxq_frame_length(adapter);
|
||||
int offset = ibmveth_rxq_frame_offset(adapter);
|
||||
int csum_good = ibmveth_rxq_csum_good(adapter);
|
||||
int lrg_pkt = ibmveth_rxq_large_packet(adapter);
|
||||
|
||||
skb = ibmveth_rxq_get_buffer(adapter);
|
||||
|
||||
/* if the large packet bit is set in the rx queue
|
||||
* descriptor, the mss will be written by PHYP eight
|
||||
* bytes from the start of the rx buffer, which is
|
||||
* skb->data at this stage
|
||||
*/
|
||||
if (lrg_pkt) {
|
||||
__be64 *rxmss = (__be64 *)(skb->data + 8);
|
||||
|
||||
mss = (u16)be64_to_cpu(*rxmss);
|
||||
}
|
||||
|
||||
new_skb = NULL;
|
||||
if (length < rx_copybreak)
|
||||
new_skb = netdev_alloc_skb(netdev, length);
|
||||
|
@ -1235,11 +1292,15 @@ restart_poll:
|
|||
if (iph->check == 0xffff) {
|
||||
iph->check = 0;
|
||||
iph->check = ip_fast_csum((unsigned char *)iph, iph->ihl);
|
||||
adapter->rx_large_packets++;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (length > netdev->mtu + ETH_HLEN) {
|
||||
ibmveth_rx_mss_helper(skb, mss, lrg_pkt);
|
||||
adapter->rx_large_packets++;
|
||||
}
|
||||
|
||||
napi_gro_receive(napi, skb); /* send it up */
|
||||
|
||||
netdev->stats.rx_packets++;
|
||||
|
|
|
@ -209,6 +209,7 @@ struct ibmveth_rx_q_entry {
|
|||
#define IBMVETH_RXQ_TOGGLE 0x80000000
|
||||
#define IBMVETH_RXQ_TOGGLE_SHIFT 31
|
||||
#define IBMVETH_RXQ_VALID 0x40000000
|
||||
#define IBMVETH_RXQ_LRG_PKT 0x04000000
|
||||
#define IBMVETH_RXQ_NO_CSUM 0x02000000
|
||||
#define IBMVETH_RXQ_CSUM_GOOD 0x01000000
|
||||
#define IBMVETH_RXQ_OFF_MASK 0x0000FFFF
|
||||
|
|
|
@ -704,6 +704,7 @@ ltq_etop_probe(struct platform_device *pdev)
|
|||
priv->pldata = dev_get_platdata(&pdev->dev);
|
||||
priv->netdev = dev;
|
||||
spin_lock_init(&priv->lock);
|
||||
SET_NETDEV_DEV(dev, &pdev->dev);
|
||||
|
||||
for (i = 0; i < MAX_DMA_CHAN; i++) {
|
||||
if (IS_TX(i))
|
||||
|
|
|
@ -18,8 +18,6 @@ config MLX5_CORE_EN
|
|||
default n
|
||||
---help---
|
||||
Ethernet support in Mellanox Technologies ConnectX-4 NIC.
|
||||
Ethernet and Infiniband support in ConnectX-4 are currently mutually
|
||||
exclusive.
|
||||
|
||||
config MLX5_CORE_EN_DCB
|
||||
bool "Data Center Bridging (DCB) Support"
|
||||
|
|
|
@ -438,9 +438,16 @@ static int smsc911x_request_resources(struct platform_device *pdev)
|
|||
ret = regulator_bulk_get(&pdev->dev,
|
||||
ARRAY_SIZE(pdata->supplies),
|
||||
pdata->supplies);
|
||||
if (ret)
|
||||
if (ret) {
|
||||
/*
|
||||
* Retry on deferrals, else just report the error
|
||||
* and try to continue.
|
||||
*/
|
||||
if (ret == -EPROBE_DEFER)
|
||||
return ret;
|
||||
netdev_err(ndev, "couldn't get regulators %d\n",
|
||||
ret);
|
||||
}
|
||||
|
||||
/* Request optional RESET GPIO */
|
||||
pdata->reset_gpiod = devm_gpiod_get_optional(&pdev->dev,
|
||||
|
|
|
@ -1113,6 +1113,7 @@ static int cpmac_probe(struct platform_device *pdev)
|
|||
if (!dev)
|
||||
return -ENOMEM;
|
||||
|
||||
SET_NETDEV_DEV(dev, &pdev->dev);
|
||||
platform_set_drvdata(pdev, dev);
|
||||
priv = netdev_priv(dev);
|
||||
|
||||
|
|
|
@ -81,6 +81,7 @@ static void cpsw_gmii_sel_am3352(struct cpsw_phy_sel_priv *priv,
|
|||
};
|
||||
|
||||
mask = GMII_SEL_MODE_MASK << (slave * 2) | BIT(slave + 6);
|
||||
mask |= BIT(slave + 4);
|
||||
mode <<= slave * 2;
|
||||
|
||||
if (priv->rmii_clock_external) {
|
||||
|
|
|
@ -47,6 +47,10 @@
|
|||
NETIF_F_TSO | \
|
||||
NETIF_F_TSO6 | \
|
||||
NETIF_F_HW_CSUM)
|
||||
|
||||
/* Restrict GSO size to account for NVGRE */
|
||||
#define NETVSC_GSO_MAX_SIZE 62768
|
||||
|
||||
static int ring_size = 128;
|
||||
module_param(ring_size, int, S_IRUGO);
|
||||
MODULE_PARM_DESC(ring_size, "Ring buffer size (# of pages)");
|
||||
|
@ -1400,6 +1404,7 @@ static int netvsc_probe(struct hv_device *dev,
|
|||
nvdev = net_device_ctx->nvdev;
|
||||
netif_set_real_num_tx_queues(net, nvdev->num_chn);
|
||||
netif_set_real_num_rx_queues(net, nvdev->num_chn);
|
||||
netif_set_gso_max_size(net, NETVSC_GSO_MAX_SIZE);
|
||||
|
||||
ret = register_netdev(net);
|
||||
if (ret != 0) {
|
||||
|
|
|
@ -546,13 +546,15 @@ static int ipvlan_link_new(struct net *src_net, struct net_device *dev,
|
|||
}
|
||||
err = ipvlan_set_port_mode(port, mode);
|
||||
if (err) {
|
||||
goto unregister_netdev;
|
||||
goto unlink_netdev;
|
||||
}
|
||||
|
||||
list_add_tail_rcu(&ipvlan->pnode, &port->ipvlans);
|
||||
netif_stacked_transfer_operstate(phy_dev, dev);
|
||||
return 0;
|
||||
|
||||
unlink_netdev:
|
||||
netdev_upper_dev_unlink(phy_dev, dev);
|
||||
unregister_netdev:
|
||||
unregister_netdevice(dev);
|
||||
destroy_ipvlan_port:
|
||||
|
|
|
@ -857,11 +857,17 @@ EXPORT_SYMBOL(phy_attached_print);
|
|||
int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
|
||||
u32 flags, phy_interface_t interface)
|
||||
{
|
||||
struct module *ndev_owner = dev->dev.parent->driver->owner;
|
||||
struct mii_bus *bus = phydev->mdio.bus;
|
||||
struct device *d = &phydev->mdio.dev;
|
||||
int err;
|
||||
|
||||
if (!try_module_get(bus->owner)) {
|
||||
/* For Ethernet device drivers that register their own MDIO bus, we
|
||||
* will have bus->owner match ndev_mod, so we do not want to increment
|
||||
* our own module->refcnt here, otherwise we would not be able to
|
||||
* unload later on.
|
||||
*/
|
||||
if (ndev_owner != bus->owner && !try_module_get(bus->owner)) {
|
||||
dev_err(&dev->dev, "failed to get the bus module\n");
|
||||
return -EIO;
|
||||
}
|
||||
|
@ -921,7 +927,8 @@ int phy_attach_direct(struct net_device *dev, struct phy_device *phydev,
|
|||
|
||||
error:
|
||||
put_device(d);
|
||||
module_put(bus->owner);
|
||||
if (ndev_owner != bus->owner)
|
||||
module_put(bus->owner);
|
||||
return err;
|
||||
}
|
||||
EXPORT_SYMBOL(phy_attach_direct);
|
||||
|
@ -971,6 +978,8 @@ EXPORT_SYMBOL(phy_attach);
|
|||
*/
|
||||
void phy_detach(struct phy_device *phydev)
|
||||
{
|
||||
struct net_device *dev = phydev->attached_dev;
|
||||
struct module *ndev_owner = dev->dev.parent->driver->owner;
|
||||
struct mii_bus *bus;
|
||||
int i;
|
||||
|
||||
|
@ -998,7 +1007,8 @@ void phy_detach(struct phy_device *phydev)
|
|||
bus = phydev->mdio.bus;
|
||||
|
||||
put_device(&phydev->mdio.dev);
|
||||
module_put(bus->owner);
|
||||
if (ndev_owner != bus->owner)
|
||||
module_put(bus->owner);
|
||||
}
|
||||
EXPORT_SYMBOL(phy_detach);
|
||||
|
||||
|
|
|
@ -602,6 +602,21 @@ static const struct driver_info cdc_mbim_info_ndp_to_end = {
|
|||
.data = CDC_NCM_FLAG_NDP_TO_END,
|
||||
};
|
||||
|
||||
/* Some modems (e.g. Telit LE922A6) do not work properly with altsetting
|
||||
* toggle done in cdc_ncm_bind_common. CDC_MBIM_FLAG_AVOID_ALTSETTING_TOGGLE
|
||||
* flag is used to avoid this procedure.
|
||||
*/
|
||||
static const struct driver_info cdc_mbim_info_avoid_altsetting_toggle = {
|
||||
.description = "CDC MBIM",
|
||||
.flags = FLAG_NO_SETINT | FLAG_MULTI_PACKET | FLAG_WWAN,
|
||||
.bind = cdc_mbim_bind,
|
||||
.unbind = cdc_mbim_unbind,
|
||||
.manage_power = cdc_mbim_manage_power,
|
||||
.rx_fixup = cdc_mbim_rx_fixup,
|
||||
.tx_fixup = cdc_mbim_tx_fixup,
|
||||
.data = CDC_MBIM_FLAG_AVOID_ALTSETTING_TOGGLE,
|
||||
};
|
||||
|
||||
static const struct usb_device_id mbim_devs[] = {
|
||||
/* This duplicate NCM entry is intentional. MBIM devices can
|
||||
* be disguised as NCM by default, and this is necessary to
|
||||
|
@ -626,6 +641,12 @@ static const struct usb_device_id mbim_devs[] = {
|
|||
{ USB_VENDOR_AND_INTERFACE_INFO(0x12d1, USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE),
|
||||
.driver_info = (unsigned long)&cdc_mbim_info_ndp_to_end,
|
||||
},
|
||||
|
||||
/* Telit LE922A6 in MBIM composition */
|
||||
{ USB_DEVICE_AND_INTERFACE_INFO(0x1bc7, 0x1041, USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE),
|
||||
.driver_info = (unsigned long)&cdc_mbim_info_avoid_altsetting_toggle,
|
||||
},
|
||||
|
||||
/* default entry */
|
||||
{ USB_INTERFACE_INFO(USB_CLASS_COMM, USB_CDC_SUBCLASS_MBIM, USB_CDC_PROTO_NONE),
|
||||
.driver_info = (unsigned long)&cdc_mbim_info_zlp,
|
||||
|
|
|
@ -839,11 +839,18 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_
|
|||
|
||||
iface_no = ctx->data->cur_altsetting->desc.bInterfaceNumber;
|
||||
|
||||
/* Device-specific flags */
|
||||
ctx->drvflags = drvflags;
|
||||
|
||||
/* Reset data interface. Some devices will not reset properly
|
||||
* unless they are configured first. Toggle the altsetting to
|
||||
* force a reset
|
||||
* force a reset.
|
||||
* Some other devices do not work properly with this procedure
|
||||
* that can be avoided using quirk CDC_MBIM_FLAG_AVOID_ALTSETTING_TOGGLE
|
||||
*/
|
||||
usb_set_interface(dev->udev, iface_no, data_altsetting);
|
||||
if (!(ctx->drvflags & CDC_MBIM_FLAG_AVOID_ALTSETTING_TOGGLE))
|
||||
usb_set_interface(dev->udev, iface_no, data_altsetting);
|
||||
|
||||
temp = usb_set_interface(dev->udev, iface_no, 0);
|
||||
if (temp) {
|
||||
dev_dbg(&intf->dev, "set interface failed\n");
|
||||
|
@ -890,9 +897,6 @@ int cdc_ncm_bind_common(struct usbnet *dev, struct usb_interface *intf, u8 data_
|
|||
/* finish setting up the device specific data */
|
||||
cdc_ncm_setup(dev);
|
||||
|
||||
/* Device-specific flags */
|
||||
ctx->drvflags = drvflags;
|
||||
|
||||
/* Allocate the delayed NDP if needed. */
|
||||
if (ctx->drvflags & CDC_NCM_FLAG_NDP_TO_END) {
|
||||
ctx->delayed_ndp16 = kzalloc(ctx->max_ndp_size, GFP_KERNEL);
|
||||
|
|
|
@ -506,7 +506,7 @@ static void vhost_vsock_reset_orphans(struct sock *sk)
|
|||
* executing.
|
||||
*/
|
||||
|
||||
if (!vhost_vsock_get(vsk->local_addr.svm_cid)) {
|
||||
if (!vhost_vsock_get(vsk->remote_addr.svm_cid)) {
|
||||
sock_set_flag(sk, SOCK_DONE);
|
||||
vsk->peer_shutdown = SHUTDOWN_MASK;
|
||||
sk->sk_state = SS_UNCONNECTED;
|
||||
|
|
|
@ -81,7 +81,8 @@
|
|||
#define CDC_NCM_TIMER_INTERVAL_MAX (U32_MAX / NSEC_PER_USEC)
|
||||
|
||||
/* Driver flags */
|
||||
#define CDC_NCM_FLAG_NDP_TO_END 0x02 /* NDP is placed at end of frame */
|
||||
#define CDC_NCM_FLAG_NDP_TO_END 0x02 /* NDP is placed at end of frame */
|
||||
#define CDC_MBIM_FLAG_AVOID_ALTSETTING_TOGGLE 0x04 /* Avoid altsetting toggle during init */
|
||||
|
||||
#define cdc_ncm_comm_intf_is_mbim(x) ((x)->desc.bInterfaceSubClass == USB_CDC_SUBCLASS_MBIM && \
|
||||
(x)->desc.bInterfaceProtocol == USB_CDC_PROTO_NONE)
|
||||
|
|
|
@ -196,5 +196,6 @@ struct can_filter {
|
|||
};
|
||||
|
||||
#define CAN_INV_FILTER 0x20000000U /* to be set in can_filter.can_id */
|
||||
#define CAN_RAW_FILTER_MAX 512 /* maximum number of can_filter set via setsockopt() */
|
||||
|
||||
#endif /* !_UAPI_CAN_H */
|
||||
|
|
|
@ -499,6 +499,9 @@ static int raw_setsockopt(struct socket *sock, int level, int optname,
|
|||
if (optlen % sizeof(struct can_filter) != 0)
|
||||
return -EINVAL;
|
||||
|
||||
if (optlen > CAN_RAW_FILTER_MAX * sizeof(struct can_filter))
|
||||
return -EINVAL;
|
||||
|
||||
count = optlen / sizeof(struct can_filter);
|
||||
|
||||
if (count > 1) {
|
||||
|
|
Loading…
Reference in a new issue