diff options
author | David S. Miller <davem@davemloft.net> | 2013-08-21 12:21:50 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2013-08-21 12:21:50 -0700 |
commit | e2748d7e930c5ef292b8496d66e546063c825c93 (patch) | |
tree | c17c80f50fc5fa83b350e28ca04630ad738d0213 /drivers/net/ethernet/freescale/fsl_pq_mdio.c | |
parent | net/mlx4_en: Reduce scope of local variables in mlx4_en_xmit (diff) | |
parent | tun: Get skfilter layout (diff) | |
download | linux-dev-e2748d7e930c5ef292b8496d66e546063c825c93.tar.xz linux-dev-e2748d7e930c5ef292b8496d66e546063c825c93.zip |
Merge branch 'tuntap'
Pavel Emelyanov says:
====================
tun: Some bits required for tun's checkpoint-restore (v2)
After taking a closer look on tun checkpoint-restore I've found several
issues with the tun's API that make it impossible to dump and restore
the state of tun device and attached tun-files.
The proposed API changes are all about extending the existing ioctl-based
stuff. Patches fit today's net-next.
This v2 has David's comments about patch #1 fixed. All the rest is the same.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/ethernet/freescale/fsl_pq_mdio.c')
0 files changed, 0 insertions, 0 deletions