You've already forked linux-apfs
mirror of
https://github.com/linux-apfs/linux-apfs.git
synced 2026-05-01 15:00:59 -07:00
net-next: remove useless union keyword
remove useless union keyword in rtable, rt6_info and dn_route. Since there is only one member in a union, the union keyword isn't useful. Signed-off-by: Changli Gao <xiaosuo@gmail.com> Signed-off-by: Eric Dumazet <eric.dumazet@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
committed by
David S. Miller
parent
592fcb9dfa
commit
d8d1f30b95
@@ -65,9 +65,7 @@ extern void dn_rt_cache_flush(int delay);
|
||||
* packets to the originating host.
|
||||
*/
|
||||
struct dn_route {
|
||||
union {
|
||||
struct dst_entry dst;
|
||||
} u;
|
||||
struct dst_entry dst;
|
||||
|
||||
struct flowi fl;
|
||||
|
||||
|
||||
@@ -84,13 +84,11 @@ struct rt6key {
|
||||
struct fib6_table;
|
||||
|
||||
struct rt6_info {
|
||||
union {
|
||||
struct dst_entry dst;
|
||||
} u;
|
||||
struct dst_entry dst;
|
||||
|
||||
#define rt6i_dev u.dst.dev
|
||||
#define rt6i_nexthop u.dst.neighbour
|
||||
#define rt6i_expires u.dst.expires
|
||||
#define rt6i_dev dst.dev
|
||||
#define rt6i_nexthop dst.neighbour
|
||||
#define rt6i_expires dst.expires
|
||||
|
||||
/*
|
||||
* Tail elements of dst_entry (__refcnt etc.)
|
||||
|
||||
+1
-1
@@ -50,7 +50,7 @@ struct ip_tunnel_prl_entry {
|
||||
int pkt_len = skb->len - skb_transport_offset(skb); \
|
||||
\
|
||||
skb->ip_summed = CHECKSUM_NONE; \
|
||||
ip_select_ident(iph, &rt->u.dst, NULL); \
|
||||
ip_select_ident(iph, &rt->dst, NULL); \
|
||||
\
|
||||
err = ip_local_out(skb); \
|
||||
if (likely(net_xmit_eval(err) == 0)) { \
|
||||
|
||||
+2
-4
@@ -50,9 +50,7 @@
|
||||
struct fib_nh;
|
||||
struct inet_peer;
|
||||
struct rtable {
|
||||
union {
|
||||
struct dst_entry dst;
|
||||
} u;
|
||||
struct dst_entry dst;
|
||||
|
||||
/* Cache lookup keys */
|
||||
struct flowi fl;
|
||||
@@ -144,7 +142,7 @@ extern void fib_add_ifaddr(struct in_ifaddr *);
|
||||
static inline void ip_rt_put(struct rtable * rt)
|
||||
{
|
||||
if (rt)
|
||||
dst_release(&rt->u.dst);
|
||||
dst_release(&rt->dst);
|
||||
}
|
||||
|
||||
#define IPTOS_RT_MASK (IPTOS_TOS_MASK & ~3)
|
||||
|
||||
Reference in New Issue
Block a user