renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2025-01-02 10:43:57 +08:00
Code

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

Browse Source 
David writes:
  "Networking:

   A few straggler bug fixes:

   1) Fix indexing of multi-pass dumps of ipv6 addresses, from David
      Ahern.

   2) Revert RCU locking change for bonding netpoll, causes worse
      problems than it solves.

   3) pskb_trim_rcsum_slow() doesn't handle odd trim offsets, resulting
      in erroneous bad hw checksum triggers with CHECKSUM_COMPLETE
      devices.  From Dimitris Michailidis.

   4) a revert to some neighbour code changes that adjust notifications
      in a way that confuses some apps."

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net:
  Revert "neighbour: force neigh_invalidate when NUD_FAILED update is from admin"
  net/ipv6: Fix index counter for unicast addresses in in6_dump_addrs
  net: fix pskb_trim_rcsum_slow() with odd trim offset
  Revert "bond: take rcu lock in netpoll_send_skb_on_dev"
This commit is contained in:
Greg Kroah-Hartman 2018-10-21 10:08:38 +02:00
commit 23469de647
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/core/neighbour.c
View File

@ -1148,8 +1148,7 @@ int neigh_update(struct neighbour *neigh, const u8 *lladdr, u8 new,
neigh->nud_state = new; neigh->nud_state = new;
err = 0; err = 0;
notify = old & NUD_VALID; notify = old & NUD_VALID;
if (((old & (NUD_INCOMPLETE | NUD_PROBE)) || if ((old & (NUD_INCOMPLETE | NUD_PROBE)) &&
(flags & NEIGH_UPDATE_F_ADMIN)) &&
(new & NUD_FAILED)) { (new & NUD_FAILED)) {
neigh_invalidate(neigh); neigh_invalidate(neigh);
notify = 1; notify = 1;

2
net/core/netpoll.c
View File

@ -312,7 +312,6 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
/* It is up to the caller to keep npinfo alive. */ /* It is up to the caller to keep npinfo alive. */
struct netpoll_info *npinfo; struct netpoll_info *npinfo;
rcu_read_lock_bh();
lockdep_assert_irqs_disabled(); lockdep_assert_irqs_disabled();
npinfo = rcu_dereference_bh(np->dev->npinfo); npinfo = rcu_dereference_bh(np->dev->npinfo);
@ -357,7 +356,6 @@ void netpoll_send_skb_on_dev(struct netpoll *np, struct sk_buff *skb,
skb_queue_tail(&npinfo->txq, skb); skb_queue_tail(&npinfo->txq, skb);
schedule_delayed_work(&npinfo->tx_work,0); schedule_delayed_work(&npinfo->tx_work,0);
} }
rcu_read_unlock_bh();
} }
EXPORT_SYMBOL(netpoll_send_skb_on_dev); EXPORT_SYMBOL(netpoll_send_skb_on_dev);

5
net/core/skbuff.c
View File

@ -1846,8 +1846,9 @@ int pskb_trim_rcsum_slow(struct sk_buff *skb, unsigned int len)
if (skb->ip_summed == CHECKSUM_COMPLETE) { if (skb->ip_summed == CHECKSUM_COMPLETE) {
int delta = skb->len - len; int delta = skb->len - len;
skb->csum = csum_sub(skb->csum, skb->csum = csum_block_sub(skb->csum,
skb_checksum(skb, len, delta, 0)); skb_checksum(skb, len, delta, 0),
len);
} }
return __pskb_trim(skb, len); return __pskb_trim(skb, len);
} }

6
net/ipv6/addrconf.c
View File

@ -4928,8 +4928,8 @@ static int in6_dump_addrs(struct inet6_dev *idev, struct sk_buff *skb,
/* unicast address incl. temp addr */ /* unicast address incl. temp addr */
list_for_each_entry(ifa, &idev->addr_list, if_list) { list_for_each_entry(ifa, &idev->addr_list, if_list) {
if (++ip_idx < s_ip_idx) if (ip_idx < s_ip_idx)
continue; goto next;
err = inet6_fill_ifaddr(skb, ifa, err = inet6_fill_ifaddr(skb, ifa,
NETLINK_CB(cb->skb).portid, NETLINK_CB(cb->skb).portid,
cb->nlh->nlmsg_seq, cb->nlh->nlmsg_seq,
@ -4938,6 +4938,8 @@ static int in6_dump_addrs(struct inet6_dev *idev, struct sk_buff *skb,
if (err < 0) if (err < 0)
break; break;
nl_dump_check_consistent(cb, nlmsg_hdr(skb)); nl_dump_check_consistent(cb, nlmsg_hdr(skb));
next:
ip_idx++;
} }
break; break;
} }