diff options
author | David S. Miller | 2014-05-13 23:46:19 +0200 |
---|---|---|
committer | David S. Miller | 2014-05-13 23:46:19 +0200 |
commit | 4b9734e547aaa947e56480ecf6d509cf9cc307cc (patch) | |
tree | 6ffcf988584c3725a7e146afae06e9cd11ac2355 /net/ipv4/tcp_ipv4.c | |
parent | net: get rid of SET_ETHTOOL_OPS (diff) | |
parent | net: cdc_ncm/cdc_mbim: rework probing of NCM/MBIM functions (diff) | |
download | kernel-qcow2-linux-4b9734e547aaa947e56480ecf6d509cf9cc307cc.tar.gz kernel-qcow2-linux-4b9734e547aaa947e56480ecf6d509cf9cc307cc.tar.xz kernel-qcow2-linux-4b9734e547aaa947e56480ecf6d509cf9cc307cc.zip |
Merge branch 'cdc_mbim-next'
Bjørn Mork says:
====================
cdc_mbim: cleanups and new features
This series depends on commit 6b5eeb7f874b ("net: cdc_mbim: handle
unaccelerated VLAN tagged frames"), which is currently in "net" but
not yet in "net-next".
Patch 4 might have a minor context collision with the "cdc_ncm: add
buffer tuning and stats using ethtool" series I just posted for
review. Please let me know if I should submit an adjusted version
in either direction. These two series' are otherwise completely
independent of each other.
The major new feature here is in patch 1, which I hope will solve
some problems with the original design without changing the existing
API, optionally allowing IP session 0 to be treated like any other
MBIM session.
The rest are some minor cleanups and finally some documentation of
the current driver APIs, after this series has been applied. I
started feeling a bit more mortal than usual lately, which probably
is healthy, and realized that I should put some of the stuff in my
head in a somewhat less volatile storage.
v2:
Fixed patch 1 so that it actually does what it claims to do. This time
it is even tested for functionality, and not just build tested...
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/ipv4/tcp_ipv4.c')
0 files changed, 0 insertions, 0 deletions