aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Ahern <dsa@cumulusnetworks.com>2015-08-23 10:21:22 -0400
committerDavid S. Miller <davem@davemloft.net>2015-08-25 16:45:52 -0400
commit2c0027cd54cc3ed856e87d9aeddb6ef00f5f17f4 (patch)
treeab9f18dffa0ba8e2797f9c276bf93a3b6b2ae38f
parent5283af899adec1a7765e413e43b27a335fadac5d (diff)
inetpeer: remove dead code
Remove various inlined functions not referenced in the kernel. Signed-off-by: David Ahern <dsa@cumulusnetworks.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/net/inetpeer.h67
1 files changed, 0 insertions, 67 deletions
diff --git a/include/net/inetpeer.h b/include/net/inetpeer.h
index d5332ddcea3f..002f0bd27001 100644
--- a/include/net/inetpeer.h
+++ b/include/net/inetpeer.h
@@ -65,71 +65,12 @@ struct inet_peer_base {
65 int total; 65 int total;
66}; 66};
67 67
68#define INETPEER_BASE_BIT 0x1UL
69
70static inline struct inet_peer *inetpeer_ptr(unsigned long val)
71{
72 BUG_ON(val & INETPEER_BASE_BIT);
73 return (struct inet_peer *) val;
74}
75
76static inline struct inet_peer_base *inetpeer_base_ptr(unsigned long val)
77{
78 if (!(val & INETPEER_BASE_BIT))
79 return NULL;
80 val &= ~INETPEER_BASE_BIT;
81 return (struct inet_peer_base *) val;
82}
83
84static inline bool inetpeer_ptr_is_peer(unsigned long val)
85{
86 return !(val & INETPEER_BASE_BIT);
87}
88
89static inline void __inetpeer_ptr_set_peer(unsigned long *val, struct inet_peer *peer)
90{
91 /* This implicitly clears INETPEER_BASE_BIT */
92 *val = (unsigned long) peer;
93}
94
95static inline bool inetpeer_ptr_set_peer(unsigned long *ptr, struct inet_peer *peer)
96{
97 unsigned long val = (unsigned long) peer;
98 unsigned long orig = *ptr;
99
100 if (!(orig & INETPEER_BASE_BIT) ||
101 cmpxchg(ptr, orig, val) != orig)
102 return false;
103 return true;
104}
105
106static inline void inetpeer_init_ptr(unsigned long *ptr, struct inet_peer_base *base)
107{
108 *ptr = (unsigned long) base | INETPEER_BASE_BIT;
109}
110
111static inline void inetpeer_transfer_peer(unsigned long *to, unsigned long *from)
112{
113 unsigned long val = *from;
114
115 *to = val;
116 if (inetpeer_ptr_is_peer(val)) {
117 struct inet_peer *peer = inetpeer_ptr(val);
118 atomic_inc(&peer->refcnt);
119 }
120}
121
122void inet_peer_base_init(struct inet_peer_base *); 68void inet_peer_base_init(struct inet_peer_base *);
123 69
124void inet_initpeers(void) __init; 70void inet_initpeers(void) __init;
125 71
126#define INETPEER_METRICS_NEW (~(u32) 0) 72#define INETPEER_METRICS_NEW (~(u32) 0)
127 73
128static inline bool inet_metrics_new(const struct inet_peer *p)
129{
130 return p->metrics[RTAX_LOCK-1] == INETPEER_METRICS_NEW;
131}
132
133/* can be called with or without local BH being disabled */ 74/* can be called with or without local BH being disabled */
134struct inet_peer *inet_getpeer(struct inet_peer_base *base, 75struct inet_peer *inet_getpeer(struct inet_peer_base *base,
135 const struct inetpeer_addr *daddr, 76 const struct inetpeer_addr *daddr,
@@ -163,12 +104,4 @@ bool inet_peer_xrlim_allow(struct inet_peer *peer, int timeout);
163 104
164void inetpeer_invalidate_tree(struct inet_peer_base *); 105void inetpeer_invalidate_tree(struct inet_peer_base *);
165 106
166/*
167 * temporary check to make sure we dont access rid, tcp_ts,
168 * tcp_ts_stamp if no refcount is taken on inet_peer
169 */
170static inline void inet_peer_refcheck(const struct inet_peer *p)
171{
172 WARN_ON_ONCE(atomic_read(&p->refcnt) <= 0);
173}
174#endif /* _NET_INETPEER_H */ 107#endif /* _NET_INETPEER_H */