Skip to content

Commit 9bc61c0

Browse files
Guillaume Naultdavem330
authored andcommitted
net: Remove DECnet leftovers from flow.h.
DECnet was removed by commit 1202cdd ("Remove DECnet support from kernel"). Let's also revome its flow structure. Compile-tested only (allmodconfig). Signed-off-by: Guillaume Nault <[email protected]> Acked-by: Stephen Hemminger <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent 5eddb24 commit 9bc61c0

File tree

1 file changed

+0
-26
lines changed

1 file changed

+0
-26
lines changed

include/net/flow.h

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,6 @@ union flowi_uli {
5454
__u8 code;
5555
} icmpt;
5656

57-
struct {
58-
__le16 dport;
59-
__le16 sport;
60-
} dnports;
61-
6257
__be32 gre_key;
6358

6459
struct {
@@ -156,27 +151,11 @@ struct flowi6 {
156151
__u32 mp_hash;
157152
} __attribute__((__aligned__(BITS_PER_LONG/8)));
158153

159-
struct flowidn {
160-
struct flowi_common __fl_common;
161-
#define flowidn_oif __fl_common.flowic_oif
162-
#define flowidn_iif __fl_common.flowic_iif
163-
#define flowidn_mark __fl_common.flowic_mark
164-
#define flowidn_scope __fl_common.flowic_scope
165-
#define flowidn_proto __fl_common.flowic_proto
166-
#define flowidn_flags __fl_common.flowic_flags
167-
__le16 daddr;
168-
__le16 saddr;
169-
union flowi_uli uli;
170-
#define fld_sport uli.ports.sport
171-
#define fld_dport uli.ports.dport
172-
} __attribute__((__aligned__(BITS_PER_LONG/8)));
173-
174154
struct flowi {
175155
union {
176156
struct flowi_common __fl_common;
177157
struct flowi4 ip4;
178158
struct flowi6 ip6;
179-
struct flowidn dn;
180159
} u;
181160
#define flowi_oif u.__fl_common.flowic_oif
182161
#define flowi_iif u.__fl_common.flowic_iif
@@ -211,11 +190,6 @@ static inline struct flowi_common *flowi6_to_flowi_common(struct flowi6 *fl6)
211190
return &(fl6->__fl_common);
212191
}
213192

214-
static inline struct flowi *flowidn_to_flowi(struct flowidn *fldn)
215-
{
216-
return container_of(fldn, struct flowi, u.dn);
217-
}
218-
219193
__u32 __get_hash_from_flowi6(const struct flowi6 *fl6, struct flow_keys *keys);
220194

221195
#endif

0 commit comments

Comments
 (0)