mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Pull networking fixes and cleanups from David Miller:
1) Revert bogus nla_ok() change, from Alexey Dobriyan.
2) Various bpf validator fixes from Daniel Borkmann.
3) Add some necessary SET_NETDEV_DEV() calls to hsis_femac and hip04
drivers, from Dongpo Li.
4) Several ethtool ksettings conversions from Philippe Reynes.
5) Fix bugs in inet port management wrt. soreuseport, from Tom Herbert.
6) XDP support for virtio_net, from John Fastabend.
7) Fix NAT handling within a vrf, from David Ahern.
8) Endianness fixes in dpaa_eth driver, from Claudiu Manoil
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net: (63 commits)
net: mv643xx_eth: fix build failure
isdn: Constify some function parameters
mlxsw: spectrum: Mark split ports as such
cgroup: Fix CGROUP_BPF config
qed: fix old-style function definition
net: ipv6: check route protocol when deleting routes
r6040: move spinlock in r6040_close as SOFTIRQ-unsafe lock order detected
irda: w83977af_ir: cleanup an indent issue
net: sfc: use new api ethtool_{get|set}_link_ksettings
net: davicom: dm9000: use new api ethtool_{get|set}_link_ksettings
net: cirrus: ep93xx: use new api ethtool_{get|set}_link_ksettings
net: chelsio: cxgb3: use new api ethtool_{get|set}_link_ksettings
net: chelsio: cxgb2: use new api ethtool_{get|set}_link_ksettings
bpf: fix mark_reg_unknown_value for spilled regs on map value marking
bpf: fix overflow in prog accounting
bpf: dynamically allocate digest scratch buffer
gtp: Fix initialization of Flags octet in GTPv1 header
gtp: gtp_check_src_ms_ipv4() always return success
net/x25: use designated initializers
isdn: use designated initializers
...
This commit is contained in:
commit
52f40e9d65
71 changed files with 1206 additions and 446 deletions
|
|
@ -111,9 +111,9 @@ static inline void lec_arp_put(struct lec_arp_table *entry)
|
|||
}
|
||||
|
||||
static struct lane2_ops lane2_ops = {
|
||||
lane2_resolve, /* resolve, spec 3.1.3 */
|
||||
lane2_associate_req, /* associate_req, spec 3.1.4 */
|
||||
NULL /* associate indicator, spec 3.1.5 */
|
||||
.resolve = lane2_resolve, /* spec 3.1.3 */
|
||||
.associate_req = lane2_associate_req, /* spec 3.1.4 */
|
||||
.associate_indicator = NULL /* spec 3.1.5 */
|
||||
};
|
||||
|
||||
static unsigned char bus_mac[ETH_ALEN] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff };
|
||||
|
|
|
|||
|
|
@ -535,33 +535,32 @@ static void eg_destroy_cache(struct mpoa_client *mpc)
|
|||
|
||||
|
||||
static const struct in_cache_ops ingress_ops = {
|
||||
in_cache_add_entry, /* add_entry */
|
||||
in_cache_get, /* get */
|
||||
in_cache_get_with_mask, /* get_with_mask */
|
||||
in_cache_get_by_vcc, /* get_by_vcc */
|
||||
in_cache_put, /* put */
|
||||
in_cache_remove_entry, /* remove_entry */
|
||||
cache_hit, /* cache_hit */
|
||||
clear_count_and_expired, /* clear_count */
|
||||
check_resolving_entries, /* check_resolving */
|
||||
refresh_entries, /* refresh */
|
||||
in_destroy_cache /* destroy_cache */
|
||||
.add_entry = in_cache_add_entry,
|
||||
.get = in_cache_get,
|
||||
.get_with_mask = in_cache_get_with_mask,
|
||||
.get_by_vcc = in_cache_get_by_vcc,
|
||||
.put = in_cache_put,
|
||||
.remove_entry = in_cache_remove_entry,
|
||||
.cache_hit = cache_hit,
|
||||
.clear_count = clear_count_and_expired,
|
||||
.check_resolving = check_resolving_entries,
|
||||
.refresh = refresh_entries,
|
||||
.destroy_cache = in_destroy_cache
|
||||
};
|
||||
|
||||
static const struct eg_cache_ops egress_ops = {
|
||||
eg_cache_add_entry, /* add_entry */
|
||||
eg_cache_get_by_cache_id, /* get_by_cache_id */
|
||||
eg_cache_get_by_tag, /* get_by_tag */
|
||||
eg_cache_get_by_vcc, /* get_by_vcc */
|
||||
eg_cache_get_by_src_ip, /* get_by_src_ip */
|
||||
eg_cache_put, /* put */
|
||||
eg_cache_remove_entry, /* remove_entry */
|
||||
update_eg_cache_entry, /* update */
|
||||
clear_expired, /* clear_expired */
|
||||
eg_destroy_cache /* destroy_cache */
|
||||
.add_entry = eg_cache_add_entry,
|
||||
.get_by_cache_id = eg_cache_get_by_cache_id,
|
||||
.get_by_tag = eg_cache_get_by_tag,
|
||||
.get_by_vcc = eg_cache_get_by_vcc,
|
||||
.get_by_src_ip = eg_cache_get_by_src_ip,
|
||||
.put = eg_cache_put,
|
||||
.remove_entry = eg_cache_remove_entry,
|
||||
.update = update_eg_cache_entry,
|
||||
.clear_expired = clear_expired,
|
||||
.destroy_cache = eg_destroy_cache
|
||||
};
|
||||
|
||||
|
||||
void atm_mpoa_init_cache(struct mpoa_client *mpc)
|
||||
{
|
||||
mpc->in_ops = &ingress_ops;
|
||||
|
|
|
|||
Loading…
Reference in a new issue