diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-02-04 14:17:11 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-02-04 14:17:11 +0000 |
| commit | bac8e20367994991eebd94b4407179684a5995ce (patch) | |
| tree | 28856888a5c30ca1e0b9c6cdc1255e9ec53568e3 /include | |
| parent | ae533a46a10a931ba45f4650ef2439ca87098bd5 (diff) | |
| parent | aa9156f4b1036ee7caf9d2a254dfc7147a084f41 (diff) | |
Merge remote-tracking branch 'remotes/jasowang/tags/net-pull-request' into staging
# gpg: Signature made Thu 04 Feb 2016 08:26:24 GMT using RSA key ID 398D6211
# gpg: Good signature from "Jason Wang (Jason Wang on RedHat) <jasowang@redhat.com>"
# gpg: WARNING: This key is not certified with sufficiently trusted signatures!
# gpg: It is not certain that the signature belongs to the owner.
# Primary key fingerprint: 215D 46F4 8246 689E C77F 3562 EF04 965B 398D 6211
* remotes/jasowang/tags/net-pull-request:
net/filter: Fix the output information for command 'info network'
net: always walk through filters in reverse if traffic is egress
net: netmap: use nm_open() to open netmap ports
e1000: eliminate infinite loops on out-of-bounds transfer start
slirp: Adding family argument to tcp_fconnect()
slirp: Make udp_attach IPv6 compatible
slirp: Add sockaddr_equal, make solookup family-agnostic
slirp: Factorizing and cleaning solookup()
slirp: Factorizing address translation
slirp: Make Socket structure IPv6 compatible
slirp: Adding address family switch for produced frames
slirp: Generalizing and neutralizing ARP code
slirp: goto bad in udp_input if sosendto fails
cadence_gem: fix buffer overflow
net: cadence_gem: check packet size in gem_recieve
qemu-doc: Do not promote deprecated -smb and -redir options
net/slirp: Tell the users when they are using deprecated options
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/net/filter.h | 1 | ||||
| -rw-r--r-- | include/net/net.h | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/include/net/filter.h b/include/net/filter.h index 2deda362a6..56399763cc 100644 --- a/include/net/filter.h +++ b/include/net/filter.h @@ -55,7 +55,6 @@ struct NetFilterState { char *netdev_id; NetClientState *netdev; NetFilterDirection direction; - char info_str[256]; QTAILQ_ENTRY(NetFilterState) next; }; diff --git a/include/net/net.h b/include/net/net.h index 7af3e15f83..73e4c466e2 100644 --- a/include/net/net.h +++ b/include/net/net.h @@ -92,7 +92,7 @@ struct NetClientState { NetClientDestructor *destructor; unsigned int queue_index; unsigned rxfilter_notify_enabled:1; - QTAILQ_HEAD(, NetFilterState) filters; + QTAILQ_HEAD(NetFilterHead, NetFilterState) filters; }; typedef struct NICState { |