Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6

[linux-2.6-omap-h63xx.git] / net / 802 / garp.c

diff --git a/net/802/garp.c b/net/802/garp.c
index 3b78f7b74fd4ade90d368e781b45dbab0cf6fc9b..1dcb0660c49dea6bc2b7ec7402eed68629d2e896 100644 (file)
--- a/net/802/garp.c
+++ b/net/802/garp.c
@@ -323,7 +323,10 @@ static void garp_attr_event(struct garp_applicant *app,
        case GARP_ACTION_NONE:
                break;
        case GARP_ACTION_S_JOIN_IN:
-               garp_pdu_append_attr(app, attr, GARP_JOIN_IN);
+               /* When appending the attribute fails, don't update state in
+                * order to retry on next TRANSMIT_PDU event. */
+               if (garp_pdu_append_attr(app, attr, GARP_JOIN_IN) < 0)
+                       return;
                break;
        case GARP_ACTION_S_LEAVE_EMPTY:
                garp_pdu_append_attr(app, attr, GARP_LEAVE_EMPTY);