X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=datapath%2Ftunnel.h;h=7e4d1a65b42413d1f03c1b5fab16823b86b0c1a1;hb=620606f63cc56c7541005dc6787106789e2c364e;hp=0c00c137ac4d8e2eeede424f3c69b1f5fd7d0b43;hpb=78adaee10bbd72b337be3401018ea434c6cf9c7f;p=sliver-openvswitch.git

diff --git a/datapath/tunnel.h b/datapath/tunnel.h
index 0c00c137a..7e4d1a65b 100644
--- a/datapath/tunnel.h
+++ b/datapath/tunnel.h
@@ -94,10 +94,7 @@ static inline void port_key_set_net(struct port_lookup_key *key, struct net *net
  * @key: Used as key for tunnel port.  Configured via OVS_TUNNEL_ATTR_*
  * attributes.
  * @rcu: RCU callback head for deferred destruction.
- * @seq: Sequence number for distinguishing configuration versions.
  * @tunnel_hlen: Tunnel header length.
- * @eth_addr: Source address for packets generated by tunnel itself
- * (e.g. ICMP fragmentation needed messages).
  * @out_key: Key to use on output, 0 if this tunnel has no fixed output key.
  * @flags: TNL_F_* flags.
  * @tos: IPv4 TOS value to use for tunnel, 0 if no fixed TOS.
@@ -107,10 +104,6 @@ struct tnl_mutable_config {
 	struct port_lookup_key key;
 	struct rcu_head rcu;
 
-	unsigned seq;
-
-	unsigned char eth_addr[ETH_ALEN];
-
 	/* Configured via OVS_TUNNEL_ATTR_* attributes. */
 	__be64	out_key;
 	u32	flags;
@@ -170,9 +163,7 @@ void ovs_tnl_destroy(struct vport *);
 int ovs_tnl_set_options(struct vport *, struct nlattr *);
 int ovs_tnl_get_options(const struct vport *, struct sk_buff *);
 
-int ovs_tnl_set_addr(struct vport *vport, const unsigned char *addr);
 const char *ovs_tnl_get_name(const struct vport *vport);
-const unsigned char *ovs_tnl_get_addr(const struct vport *vport);
 int ovs_tnl_send(struct vport *vport, struct sk_buff *skb);
 void ovs_tnl_rcv(struct vport *vport, struct sk_buff *skb);